@autofleet/sequelize-utils 5.0.11 → 5.1.0

package/dist/index.js

@@ -41,43 +41,27 @@ exports.default = (sequelize) => {
     });
     // eslint-disable-next-line @typescript-eslint/ban-types
     const httpBasedTransaction = (req, cb) => {
-        if (req.aborted) {
+        if (req.socket.destroyed) {
             log(abortErrorText);
             throw new Error(abortErrorText);
         }
         return sequelize.transaction((transaction) => __awaiter(void 0, void 0, void 0, function* () {
             // https://github.com/nodejs/node/blob/e46c680bf2b211bbd52cf959ca17ee98c7f657f5/test/parallel/test-http-aborted.js#L9
-            if (req.aborted) {
+            const rollback = () => __awaiter(void 0, void 0, void 0, function* () {
                 log(abortErrorText);
-                console.log('aborted: on pre');
                 yield transaction.rollback();
-                return null;
-            }
-            req.on('aborted', () => __awaiter(void 0, void 0, void 0, function* () {
-                console.log('aborted: on callback');
-                log(abortErrorText);
-                yield transaction.rollback();
-            }));
-            if (req.aborted) {
-                log(abortErrorText);
-                console.log('aborted: on pre');
-                yield transaction.rollback();
-                return null;
-            }
+            });
+            req.socket.on('close', rollback);
             try {
                 const response = yield cb(transaction);
-                if (req.aborted) {
-                    log(abortErrorText);
-                    console.log('aborted: on post');
-                    yield transaction.rollback();
-                    return null;
-                }
+                req.socket.removeListener('close', rollback);
                 return response;
             }
             catch (e) {
                 if (e.message.includes(rollbackErrorText)) {
                     throw new Error(abortErrorText);
                 }
+                req.socket.on('close', rollback);
                 throw e;
             }
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sequelize-utils",
-  "version": "5.0.11",
+  "version": "5.1.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -13,9 +13,13 @@
     "test-local": "jest --forceExit",
     "coverage": "jest --coverage --forceExit --runInBand && rm -rf ./coverage"
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@autofleet/network": "^1.3.7",
     "debug": "^4.3.2",
     "jest": "^27.0.6",
     "sequelize": "^5.22.3"
@@ -29,6 +33,7 @@
     "@typescript-eslint/eslint-plugin": "^4.28.3",
     "@typescript-eslint/parser": "^4.28.3",
     "axios": "^0.26.1",
+    "bluebird": "^3.7.2",
     "eslint": "^7.31.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-import": "^2.23.4",

package/src/index.ts

@@ -33,45 +33,27 @@ export default (sequelize: Sequelize): {
 
   // eslint-disable-next-line @typescript-eslint/ban-types
   const httpBasedTransaction = (req: any, cb: Function) => {
-    if (req.aborted) {
+    if (req.socket.destroyed) {
       log(abortErrorText);
       throw new Error(abortErrorText);
     }
     return sequelize.transaction(async (transaction: Transaction) => {
       // https://github.com/nodejs/node/blob/e46c680bf2b211bbd52cf959ca17ee98c7f657f5/test/parallel/test-http-aborted.js#L9
-      if (req.aborted) {
+      const rollback = async () => {
         log(abortErrorText);
-        console.log('aborted: on pre');
         await transaction.rollback();
-        return null;
-      }
-
-      req.on('aborted', async () => {
-        console.log('aborted: on callback');
-        log(abortErrorText);
-        await transaction.rollback();
-      });
-
-      if (req.aborted) {
-        log(abortErrorText);
-        console.log('aborted: on pre');
-        await transaction.rollback();
-        return null;
-      }
+      };
+      req.socket.on('close', rollback);
 
       try {
         const response = await cb(transaction);
-        if (req.aborted) {
-          log(abortErrorText);
-          console.log('aborted: on post');
-          await transaction.rollback();
-          return null;
-        }
+        req.socket.removeListener('close', rollback);
         return response;
       } catch (e) {
         if (e.message.includes(rollbackErrorText)) {
           throw new Error(abortErrorText);
         }
+        req.socket.on('close', rollback);
         throw e;
       }
     });

package/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "commonjs",
     "declaration": true,
     "outDir": "./dist",
-    "strict": true,
+    "strict": false,
     "esModuleInterop": true
   }
 }

package/dist/src/index.d.ts

@@ -1,6 +0,0 @@
-import { Sequelize } from 'sequelize';
-declare const _default: (sequelize: Sequelize) => {
-    transactionWithRetry: any;
-    httpBasedTransaction: any;
-};
-export default _default;

package/dist/src/index.js

@@ -1,89 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable import/prefer-default-export */
-const sequelize_1 = require("sequelize");
-const debug_1 = __importDefault(require("debug"));
-const log = debug_1.default('sequelize-utils');
-const rollbackErrorText = 'rollback has been called on this transaction';
-const abortErrorText = 'Transaction cancelled due to request cancellation';
-exports.default = (sequelize) => {
-    const transactionWithRetry = (funcToRun, retriesCount = 2) => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            const transValue = yield sequelize.transaction((transaction) => __awaiter(void 0, void 0, void 0, function* () {
-                const funcValue = yield funcToRun(transaction);
-                return funcValue;
-            }));
-            return transValue;
-        }
-        catch (e) {
-            if (e instanceof sequelize_1.DatabaseError) {
-                if (retriesCount === 0) {
-                    log('error inside transactionWithRetry - will stop retry', e);
-                    throw e;
-                }
-                log(`error inside transactionWithRetry - will retry times ${retriesCount - 1}`, e);
-                return transactionWithRetry(funcToRun, retriesCount - 1);
-            }
-            throw e;
-        }
-    });
-    // eslint-disable-next-line @typescript-eslint/ban-types
-    const httpBasedTransaction = (req, cb) => {
-        if (req.aborted) {
-            log(abortErrorText);
-            throw new Error(abortErrorText);
-        }
-        return sequelize.transaction((transaction) => __awaiter(void 0, void 0, void 0, function* () {
-            // https://github.com/nodejs/node/blob/e46c680bf2b211bbd52cf959ca17ee98c7f657f5/test/parallel/test-http-aborted.js#L9
-            if (req.aborted) {
-                log(abortErrorText);
-                console.log('aborted: on pre');
-                yield transaction.rollback();
-                return null;
-            }
-            req.on('aborted', () => __awaiter(void 0, void 0, void 0, function* () {
-                console.log('aborted: on callback');
-                log(abortErrorText);
-                yield transaction.rollback();
-            }));
-            if (req.aborted) {
-                log(abortErrorText);
-                console.log('aborted: on pre');
-                yield transaction.rollback();
-                return null;
-            }
-            try {
-                const response = yield cb(transaction);
-                if (req.aborted) {
-                    log(abortErrorText);
-                    console.log('aborted: on post');
-                    yield transaction.rollback();
-                    return null;
-                }
-                return response;
-            }
-            catch (e) {
-                if (e.message.includes(rollbackErrorText)) {
-                    throw new Error(abortErrorText);
-                }
-                throw e;
-            }
-        }));
-    };
-    return {
-        httpBasedTransaction,
-        transactionWithRetry,
-    };
-};