@naturalcycles/datastore-lib 3.38.2 → 3.38.3

package/dist/datastore.db.d.ts

@@ -57,6 +57,11 @@ export declare class DatastoreDB extends BaseCommonDB implements CommonDB {
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;
     private getPRetryOptions;
+    /**
+     * Silently rollback the transaction.
+     * It may happen that transaction is already committed/rolled back, so we don't want to throw an error here.
+     */
+    private rollback;
 }
 /**
  * https://cloud.google.com/datastore/docs/concepts/transactions#datastore-datastore-transactional-update-nodejs

package/dist/datastore.db.js

@@ -223,7 +223,7 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
             await datastoreTx.commit();
         }
         catch (err) {
-            await datastoreTx.rollback();
+            await this.rollback(datastoreTx);
             throw err;
         }
     }
@@ -379,6 +379,19 @@ class DatastoreDB extends db_lib_1.BaseCommonDB {
             },
         };
     }
+    /**
+     * Silently rollback the transaction.
+     * It may happen that transaction is already committed/rolled back, so we don't want to throw an error here.
+     */
+    async rollback(datastoreTx) {
+        try {
+            await datastoreTx.rollback();
+        }
+        catch (err) {
+            // log the error, but don't re-throw, as this should be a graceful rollback
+            this.cfg.logger.error(err);
+        }
+    }
 }
 exports.DatastoreDB = DatastoreDB;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/datastore-lib",
-  "version": "3.38.2",
+  "version": "3.38.3",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
     "prepare": "husky",

package/src/datastore.db.ts

@@ -374,7 +374,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
       await fn(tx)
       await datastoreTx.commit()
     } catch (err) {
-      await datastoreTx.rollback()
+      await this.rollback(datastoreTx)
       throw err
     }
   }
@@ -549,6 +549,19 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
       },
     }
   }
+
+  /**
+   * Silently rollback the transaction.
+   * It may happen that transaction is already committed/rolled back, so we don't want to throw an error here.
+   */
+  private async rollback(datastoreTx: Transaction): Promise<void> {
+    try {
+      await datastoreTx.rollback()
+    } catch (err) {
+      // log the error, but don't re-throw, as this should be a graceful rollback
+      this.cfg.logger.error(err)
+    }
+  }
 }
 
 /**