@sima-land/isomorph 11.0.0-alpha.30 → 11.0.0-alpha.31

package/error-tracking/index.d.ts

@@ -16,6 +16,7 @@ export declare class SentryError extends Error {
  * @todo Этот класс должен называться либо SentryReadyBreadcrumb либо в названии вообще не должен фигурировать Sentry.
  */
 export declare class SentryBreadcrumb {
+    type: string;
     data: SentryBreadcrumbData;
     /**
      * @param data Данные.

package/error-tracking/index.js

@@ -25,8 +25,10 @@ class SentryBreadcrumb {
      * @param data Данные.
      */
     constructor(data) {
+        this.type = 'breadcrumb';
         this.data = data;
     }
 }
 exports.SentryBreadcrumb = SentryBreadcrumb;
+// @todo переименовать error-tracking в events и добавить сюда остальные классы ошибок и событий?
 //# sourceMappingURL=index.js.map

package/error-tracking/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/error-tracking/index.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;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;IACnB,CAAC;CACF;AAXD,kCAWC;AAED;;;GAGG;AACH,MAAa,gBAAgB;IAG3B;;OAEG;IACH,YAAY,IAA0B;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AATD,4CASC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/error-tracking/index.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;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;IACnB,CAAC;CACF;AAXD,kCAWC;AAED;;;GAGG;AACH,MAAa,gBAAgB;IAI3B;;OAEG;IACH,YAAY,IAA0B;QACpC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAXD,4CAWC;AAED,iGAAiG"}

package/http-client/middleware/cookie.js

@@ -17,7 +17,7 @@ function collectCookieMiddleware(request, response) {
                 Cookie: store.asHeader(),
             },
         });
-        if (result.headers['set-cookie']) {
+        if (result.headers['set-cookie'] && !response.writableEnded) {
             store.set(result.headers['set-cookie']);
             response.setHeader('cookie', store.asHeader());
         }

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

@@ -1 +1 @@
-{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../../src/http-client/middleware/cookie.ts"],"names":[],"mappings":";;;AAQA;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAC,OAAgB,EAAE,QAAkB;IAC1E,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvD,OAAO,KAAK,UAAU,aAAa,CAAC,MAAM,EAAE,IAAI;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC;YACxB,GAAG,MAAM;YACT,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE;aACzB;SACF,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAChC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;YACxC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;SAChD;IACH,CAAC,CAAC;AACJ,CAAC;AAjBD,0DAiBC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,aAAsB;IACtD,MAAM,IAAI,GAAoD,EAAE,CAAC;IAEjE,8DAA8D;IAC9D,SAAS,OAAO,CAAC,UAAkB;QACjC,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjF,IAAI,UAAU,IAAI,WAAW,EAAE;YAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;SAC7D;IACH,CAAC;IAED,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE;QACzC,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;SACf;KACF;IAED,8DAA8D;IAC9D,SAAS,GAAG,CAAC,qBAA+B;QAC1C,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE;YACxC,gCAAgC;YAChC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,OAAO,CAAC,MAAM,CAAC,CAAC;SACjB;IACH,CAAC;IAED,8DAA8D;IAC9D,SAAS,QAAQ;QACf,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;aACvB,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;AAC3B,CAAC;AAnCD,8CAmCC"}
+{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../../src/http-client/middleware/cookie.ts"],"names":[],"mappings":";;;AAQA;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAC,OAAgB,EAAE,QAAkB;IAC1E,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvD,OAAO,KAAK,UAAU,aAAa,CAAC,MAAM,EAAE,IAAI;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC;YACxB,GAAG,MAAM;YACT,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE;aACzB;SACF,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE;YAC3D,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;YACxC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;SAChD;IACH,CAAC,CAAC;AACJ,CAAC;AAjBD,0DAiBC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,aAAsB;IACtD,MAAM,IAAI,GAAoD,EAAE,CAAC;IAEjE,8DAA8D;IAC9D,SAAS,OAAO,CAAC,UAAkB;QACjC,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjF,IAAI,UAAU,IAAI,WAAW,EAAE;YAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;SAC7D;IACH,CAAC;IAED,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE;QACzC,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;SACf;KACF;IAED,8DAA8D;IAC9D,SAAS,GAAG,CAAC,qBAA+B;QAC1C,KAAK,MAAM,IAAI,IAAI,qBAAqB,EAAE;YACxC,gCAAgC;YAChC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACjC,OAAO,CAAC,MAAM,CAAC,CAAC;SACjB;IACH,CAAC;IAED,8DAA8D;IAC9D,SAAS,QAAQ;QACf,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;aACvB,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;aAC/C,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;AAC3B,CAAC;AAnCD,8CAmCC"}

package/http-client/middleware/headers.js

@@ -17,7 +17,8 @@ function passHeadersMiddleware(req, { predicate } = { predicate: () => true }) {
                 headers[headerName] = headerValue;
             }
         }
-        await next({ ...config, headers });
+        // ВАЖНО: не ждем ответа тк он может упасть + нам не важен результат
+        next({ ...config, headers });
     };
 }
 exports.passHeadersMiddleware = passHeadersMiddleware;

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

@@ -1 +1 @@
-{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/http-client/middleware/headers.ts"],"names":[],"mappings":";;;AAQA;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,GAAY,EACZ,EAAE,SAAS,KAAyB,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;IAE7D,OAAO,KAAK,UAAU,WAAW,CAAC,MAAM,EAAE,IAAI;QAC5C,MAAM,OAAO,GAA2B,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE9D,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,OAAO,EAAE;YACpC,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAE5C,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE;gBACzE,OAAO,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;aACnC;SACF;QAED,MAAM,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAjBD,sDAiBC"}
+{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../src/http-client/middleware/headers.ts"],"names":[],"mappings":";;;AAQA;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,GAAY,EACZ,EAAE,SAAS,KAAyB,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;IAE7D,OAAO,KAAK,UAAU,WAAW,CAAC,MAAM,EAAE,IAAI;QAC5C,MAAM,OAAO,GAA2B,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAE9D,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,OAAO,EAAE;YACpC,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAE5C,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE;gBACzE,OAAO,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;aACnC;SACF;QAED,oEAAoE;QACpE,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAlBD,sDAkBC"}

package/http-server/middleware/log.js

@@ -12,18 +12,29 @@ const number_1 = require("../../utils/number");
 function logMiddleware(config, logger) {
     return function log(req, res, next) {
         const start = process.hrtime.bigint();
+        const remoteIp = (0, utils_1.getXClientIp)(req);
+        // @todo перенести в пресеты?
+        const startMsg = {
+            type: 'http.request[incoming]',
+            version: config.appVersion,
+            route: req.originalUrl,
+            method: req.method,
+            remote_ip: remoteIp,
+        };
+        logger.info(startMsg);
         res.once('finish', () => {
             const finish = process.hrtime.bigint();
             // @todo перенести в пресеты?
-            const message = {
+            const finishMsg = {
+                type: 'http.response[outgoing]',
                 version: config.appVersion,
                 route: req.originalUrl,
                 method: req.method,
                 status: res.statusCode,
-                remote_ip: (0, utils_1.getXClientIp)(req),
+                remote_ip: remoteIp,
                 latency: (0, number_1.toMilliseconds)(finish - start),
             };
-            logger.info(message);
+            logger.info(finishMsg);
         });
         next();
     };

package/http-server/middleware/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/http-server/middleware/log.ts"],"names":[],"mappings":";;;AAGA,oCAAwC;AACxC,+CAAoD;AAEpD;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,MAAkB,EAAE,MAAc;IAC9D,OAAO,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,6BAA6B;YAC7B,MAAM,OAAO,GAA2B;gBACtC,OAAO,EAAE,MAAM,CAAC,UAAU;gBAC1B,KAAK,EAAE,GAAG,CAAC,WAAW;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,MAAM,EAAE,GAAG,CAAC,UAAU;gBACtB,SAAS,EAAE,IAAA,oBAAY,EAAC,GAAG,CAAC;gBAC5B,OAAO,EAAE,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC;aACxC,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAtBD,sCAsBC"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/http-server/middleware/log.ts"],"names":[],"mappings":";;;AAGA,oCAAwC;AACxC,+CAAoD;AAEpD;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,MAAkB,EAAE,MAAc;IAC9D,OAAO,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAC;QAEnC,6BAA6B;QAC7B,MAAM,QAAQ,GAA0E;YACtF,IAAI,EAAE,wBAAwB;YAC9B,OAAO,EAAE,MAAM,CAAC,UAAU;YAC1B,KAAK,EAAE,GAAG,CAAC,WAAW;YACtB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,SAAS,EAAE,QAAQ;SACpB,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,6BAA6B;YAC7B,MAAM,SAAS,GAA8C;gBAC3D,IAAI,EAAE,yBAAyB;gBAC/B,OAAO,EAAE,MAAM,CAAC,UAAU;gBAC1B,KAAK,EAAE,GAAG,CAAC,WAAW;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,MAAM,EAAE,GAAG,CAAC,UAAU;gBACtB,SAAS,EAAE,QAAQ;gBACnB,OAAO,EAAE,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC;aACxC,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAnCD,sCAmCC"}

package/package.json

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

package/tracing/index.d.ts

@@ -5,5 +5,6 @@ import { Resource } from '@opentelemetry/resources';
  * Может быть дополнен с помощью метода merge.
  * @param config Конфиг.
  * @return Ресурс для провайдера.
+ * @todo Перенести в пресеты?
  */
 export declare function getConventionalResource(config: BaseConfig): Resource;

package/tracing/index.js

@@ -8,6 +8,7 @@ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
  * Может быть дополнен с помощью метода merge.
  * @param config Конфиг.
  * @return Ресурс для провайдера.
+ * @todo Перенести в пресеты?
  */
 function getConventionalResource(config) {
     return new resources_1.Resource({

package/tracing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;AACA,wDAAoD;AACpD,8EAAiF;AAEjF;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAC,MAAkB;IACxD,OAAO,IAAI,oBAAQ,CAAC;QAClB,CAAC,iDAA0B,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO;QACzD,CAAC,iDAA0B,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU;QAC/D,CAAC,iDAA0B,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,GAAG;KAChE,CAAC,CAAC;AACL,CAAC;AAND,0DAMC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;AACA,wDAAoD;AACpD,8EAAiF;AAEjF;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,MAAkB;IACxD,OAAO,IAAI,oBAAQ,CAAC;QAClB,CAAC,iDAA0B,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO;QACzD,CAAC,iDAA0B,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,UAAU;QAC/D,CAAC,iDAA0B,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC,GAAG;KAChE,CAAC,CAAC;AACL,CAAC;AAND,0DAMC"}

package/utils/redux-saga/middleware.js

@@ -25,37 +25,82 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSagaMiddleware = void 0;
 const redux_saga_1 = __importStar(require("redux-saga"));
+const effects_1 = require("redux-saga/effects");
 /**
  * Возвращает расширенную версию SagaMiddleware.
  * @param handler Обработчик событий.
  * @return Middleware.
  */
 function createSagaExtendedMiddleware(handler) {
-    const privates = {};
-    const sagaMiddleware = (0, redux_saga_1.default)({
-        onError: (error, info) => {
-            handler.onSagaError(error, info);
-        },
-    });
-    const middleware = api => {
-        privates.api = api;
-        return sagaMiddleware(api);
-    };
-    middleware.timeout = function timeout(milliseconds) {
-        privates.timeout = milliseconds;
+    return new MiddlewareControl(handler).toMiddleware();
+}
+exports.createSagaMiddleware = createSagaExtendedMiddleware;
+class MiddlewareControl {
+    constructor(handler) {
+        this.handler = handler;
+        this.sagaMiddleware = (0, redux_saga_1.default)({
+            onError: (error, info) => {
+                handler.onSagaError(error, info);
+            },
+        });
+    }
+    toMiddleware() {
+        const middleware = api => {
+            this.api = api;
+            return this.sagaMiddleware(api);
+        };
+        middleware.timeout = (milliseconds, config) => {
+            this.configInterrupt(milliseconds, config);
+            return middleware;
+        };
+        middleware.run = async (saga, ...args) => {
+            await this.run(saga, ...args);
+        };
         return middleware;
-    };
-    middleware.run = async function run(saga, ...args) {
-        const { api, timeout } = privates;
-        const promises = [];
-        let ready = false;
-        let timerId;
+    }
+    configInterrupt(milliseconds, config) {
+        this.interruptTimeout = milliseconds;
+        this.interruptStrategy = config?.strategy ?? 'cancel-task';
+    }
+    async run(saga, ...args) {
+        const { interruptTimeout } = this;
+        if (typeof interruptTimeout === 'number' && Number.isFinite(interruptTimeout)) {
+            switch (this.interruptStrategy) {
+                case 'cancel-task':
+                    await this.runWithBreakTask({ saga, args, timeout: interruptTimeout });
+                    return;
+                case 'dispatch-end':
+                    await this.runWithBreakMiddleware({ saga, args, timeout: interruptTimeout });
+                    return;
+            }
+        }
+        await this.sagaMiddleware.run(saga, ...args).toPromise();
+    }
+    async runWithBreakTask(data) {
+        try {
+            await this.sagaMiddleware.run(runWithTimeLimit, data).toPromise();
+        }
+        catch (error) {
+            if (error instanceof TimeoutInterruptError) {
+                this.handler.onTimeoutInterrupt({ timeout: data.timeout });
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+    async runWithBreakMiddleware(data) {
+        const { saga, args, timeout } = data;
+        const { api } = this;
         if (!api) {
             const error = new Error('Middleware is not applied to the store');
-            handler.onConfigError(error);
+            this.handler.onConfigError(error);
             throw error;
         }
-        promises.push(sagaMiddleware
+        const promises = [];
+        let ready = false;
+        let timerId;
+        promises.push(this.sagaMiddleware
             .run(saga, ...args)
             .toPromise()
             .then(() => {
@@ -65,20 +110,34 @@ function createSagaExtendedMiddleware(handler) {
             // вне зависимости от результата отключаем таймер если он есть
             timerId !== undefined && clearTimeout(timerId);
         }));
-        if (typeof timeout === 'number' && Number.isFinite(timeout)) {
-            promises.push(new Promise(resolve => {
-                timerId = setTimeout(() => {
-                    if (!ready) {
-                        handler.onTimeoutInterrupt({ timeout });
-                        api.dispatch(redux_saga_1.END);
-                    }
-                    resolve();
-                }, timeout);
-            }));
-        }
+        promises.push(new Promise(resolve => {
+            timerId = setTimeout(() => {
+                if (!ready) {
+                    this.handler.onTimeoutInterrupt({ timeout });
+                    api.dispatch(redux_saga_1.END);
+                }
+                resolve();
+            }, timeout);
+        }));
         await Promise.race(promises);
-    };
-    return middleware;
+    }
+}
+function* runWithTimeLimit(data) {
+    const { saga, args, timeout } = data;
+    const task = yield (0, effects_1.fork)(saga, ...args);
+    const [isTimeout, taskResult] = yield (0, effects_1.race)([
+        (0, effects_1.delay)(timeout, true),
+        (0, effects_1.call)(() => task.toPromise()),
+    ]);
+    if (isTimeout) {
+        yield (0, effects_1.cancel)(task);
+        throw new TimeoutInterruptError();
+    }
+    return taskResult;
+}
+class TimeoutInterruptError extends Error {
+    constructor() {
+        super('Saga was cancelled by timeout');
+    }
 }
-exports.createSagaMiddleware = createSagaExtendedMiddleware;
 //# sourceMappingURL=middleware.js.map

package/utils/redux-saga/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/utils/redux-saga/middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,yDAA6D;AAE7D;;;;GAIG;AACH,SAAS,4BAA4B,CAAC,OAA8B;IAClE,MAAM,QAAQ,GAGV,EAAE,CAAC;IAEP,MAAM,cAAc,GAAG,IAAA,oBAAoB,EAAC;QAC1C,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvB,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAA2B,GAAG,CAAC,EAAE;QAC/C,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;QACnB,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,GAAG,SAAS,OAAO,CAAC,YAAoB;QACxD,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC;QAChC,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,GAAG,KAAK,UAAU,GAAG,CACjC,IAAO,EACP,GAAG,IAAmB;QAEtB,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAClC,MAAM,QAAQ,GAAoB,EAAE,CAAC;QAErC,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,OAAsC,CAAC;QAE3C,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAElE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE7B,MAAM,KAAK,CAAC;SACb;QAED,QAAQ,CAAC,IAAI,CACX,cAAc;aACX,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;aAClB,SAAS,EAAE;aACX,IAAI,CAAC,GAAG,EAAE;YACT,KAAK,GAAG,IAAI,CAAC;QACf,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACZ,8DAA8D;YAC9D,OAAO,KAAK,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC,CAAC,CACL,CAAC;QAEF,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC3D,QAAQ,CAAC,IAAI,CACX,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;gBAC1B,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;oBACxB,IAAI,CAAC,KAAK,EAAE;wBACV,OAAO,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;wBACxC,GAAG,CAAC,QAAQ,CAAC,gBAAG,CAAC,CAAC;qBACnB;oBAED,OAAO,EAAE,CAAC;gBACZ,CAAC,EAAE,OAAO,CAAC,CAAC;YACd,CAAC,CAAC,CACH,CAAC;SACH;QAED,MAAM,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC;AAEwC,4DAAoB"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/utils/redux-saga/middleware.ts"],"names":[],"mappings":"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"}

package/utils/redux-saga/types.d.ts

@@ -1,13 +1,34 @@
 import type { Middleware } from '@reduxjs/toolkit';
 import type { Saga, SagaMiddlewareOptions } from 'redux-saga';
+/** Опции остановки redux-saga. */
+export interface SagaInterruptConfig {
+    strategy?: 'dispatch-end' | 'cancel-task';
+}
+/** Информация, которая приходит вторым аргументом в обработчик ошибки SagaMiddleware. */
 export type SagaErrorInfo = Parameters<Required<SagaMiddlewareOptions>['onError']>[1];
+/** Информация об остановке redux-saga. */
 export interface SagaInterruptInfo {
     timeout: number;
 }
+/** Опции запуска redux-saga с остановкой по таймауту. */
+export interface SagaTimeoutRunData<S extends Saga> {
+    saga: S;
+    args: Parameters<S>;
+    timeout: number;
+}
+/** Кастомная версия SagaMiddleware. */
 export interface SagaExtendedMiddleware extends Middleware {
-    timeout(milliseconds: number): this;
+    /**
+     * Установить временное ограничение работы саги.
+     * Если сага не успела выполнится до истечения этого ограничения она будет принудительно завершена.
+     */
+    timeout(milliseconds: number, config?: SagaInterruptConfig): this;
+    /**
+     * Запускает сагу.
+     */
     run: <S extends Saga>(saga: S, ...args: Parameters<S>) => Promise<void>;
 }
+/** Обработчик событий SagaExtendedMiddleware. */
 export interface SagaMiddlewareHandler {
     onSagaError(error: Error, errorInfo: SagaErrorInfo): Promise<void> | void;
     onConfigError(error: Error): Promise<void> | void;