@naturalcycles/datastore-lib 4.1.0 → 4.3.0

package/dist/datastore.db.js

@@ -14,7 +14,9 @@ const RETRY_ON = [
     'UNAVAILABLE',
     'UNKNOWN',
     'DEADLINE_EXCEEDED',
+    'ABORTED',
     'much contention',
+    'try again',
     'timeout',
 ].map(s => s.toLowerCase());
 // Examples of errors:
@@ -249,7 +251,14 @@ export class DatastoreDB extends BaseCommonDB {
     async deleteByIds(table, ids, opt = {}) {
         const ds = await this.ds();
         const keys = ids.map(id => this.key(ds, table, id));
-        await pMap(_chunk(keys, MAX_ITEMS), async (batch) => await (opt.tx?.tx || ds).delete(batch), {
+        const retryOptions = this.getPRetryOptions(`DatastoreLib.deleteByIds(${table})`);
+        await pMap(_chunk(keys, MAX_ITEMS), 
+        // async batch => await doDelete(batch),
+        async (batchOfKeys) => {
+            await pRetry(async () => {
+                await (opt.tx?.tx || ds).delete(batchOfKeys);
+            }, retryOptions);
+        }, {
             concurrency: DATASTORE_RECOMMENDED_CONCURRENCY,
         });
         return ids.length;

package/package.json

@@ -1,28 +1,25 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "description": "Opinionated library to work with Google Datastore",
   "scripts": {
-    "prepare": "husky",
     "build": "dev-lib build",
     "test": "dev-lib test",
     "lint": "dev-lib lint",
     "bt": "dev-lib bt",
-    "lbt": "dev-lib lbt"
+    "lbt": "dev-lib lbt",
+    "check": "dev-lib lbt"
   },
   "dependencies": {
     "@google-cloud/datastore": "^10",
-    "@naturalcycles/db-lib": "^10",
-    "@naturalcycles/js-lib": "^15",
-    "@naturalcycles/nodejs-lib": "^14"
+    "@naturalcycles/db-lib": "workspace:^10",
+    "@naturalcycles/js-lib": "workspace:^15",
+    "@naturalcycles/nodejs-lib": "workspace:^14"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^18",
-    "@types/node": "^22",
-    "@vitest/coverage-v8": "^3",
-    "tsx": "^4",
-    "vitest": "^3"
+    "@naturalcycles/dev-lib": "*",
+    "@types/node": "^22"
   },
   "files": [
     "dist",
@@ -37,13 +34,13 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "packageManager": "yarn@1.22.22",
   "publishConfig": {
     "access": "public"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/NaturalCycles/datastore-lib"
+    "url": "git@github.com:NaturalCycles/js-libs.git",
+    "directory": "packages/datastore-lib"
   },
   "keywords": [
     "datastore",

package/src/datastore.db.ts

@@ -65,7 +65,9 @@ const RETRY_ON = [
   'UNAVAILABLE',
   'UNKNOWN',
   'DEADLINE_EXCEEDED',
+  'ABORTED',
   'much contention',
+  'try again',
   'timeout',
 ].map(s => s.toLowerCase())
 // Examples of errors:
@@ -416,10 +418,16 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
     const ds = await this.ds()
     const keys = ids.map(id => this.key(ds, table, id))
 
+    const retryOptions = this.getPRetryOptions(`DatastoreLib.deleteByIds(${table})`)
+
     await pMap(
       _chunk(keys, MAX_ITEMS),
-
-      async batch => await ((opt.tx as DatastoreDBTransaction)?.tx || ds).delete(batch),
+      // async batch => await doDelete(batch),
+      async batchOfKeys => {
+        await pRetry(async () => {
+          await ((opt.tx as DatastoreDBTransaction)?.tx || ds).delete(batchOfKeys)
+        }, retryOptions)
+      },
       {
         concurrency: DATASTORE_RECOMMENDED_CONCURRENCY,
       },