@naturalcycles/datastore-lib 4.19.0 → 4.19.1

package/dist/datastoreStreamReadable.js

@@ -1,6 +1,7 @@
 import { Readable } from 'node:stream';
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { TimeoutError } from '@naturalcycles/js-lib/error';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { getRunQueryOptions } from './query.util.js';
@@ -159,7 +160,8 @@ export class DatastoreStreamReadable extends Readable {
                 return await q.run(this.dsOpt);
             }, {
                 name: `DatastoreStreamReadable.query(${table})`,
-                predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
+                predicate: err => err instanceof TimeoutError ||
+                    RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
                 maxAttempts: 5,
                 delay: 5000,
                 delayMultiplier: 2,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/datastore-lib",
   "type": "module",
-  "version": "4.19.0",
+  "version": "4.19.1",
   "description": "Opinionated library to work with Google Datastore, implements CommonDB",
   "dependencies": {
     "@google-cloud/datastore": "^10",

package/src/datastoreStreamReadable.ts

@@ -7,6 +7,7 @@ import type {
 } from '@google-cloud/datastore/build/src/query.js'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
+import { TimeoutError } from '@naturalcycles/js-lib/error'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
@@ -214,7 +215,9 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
         },
         {
           name: `DatastoreStreamReadable.query(${table})`,
-          predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
+          predicate: err =>
+            err instanceof TimeoutError ||
+            RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
           maxAttempts: 5,
           delay: 5000,
           delayMultiplier: 2,