@naturalcycles/datastore-lib 4.15.0 → 4.15.1

package/dist/datastore.db.js

@@ -225,7 +225,7 @@ export class DatastoreDB extends BaseCommonDB {
             (opt.experimentalCursorStream
                 ? new DatastoreStreamReadable(q, opt)
                 : ds.runQueryStream(q, this.getRunQueryOptions(opt)))
-                .on('error', err => transform.emit('error', err))
+                .on('error', err => transform.destroy(err))
                 .pipe(transform);
         });
         return transform;

package/dist/datastoreStreamReadable.js

@@ -91,7 +91,7 @@ export class DatastoreStreamReadable extends Readable {
         }
         void this.runNextQuery().catch(err => {
             this.logger.error('error in runNextQuery', err);
-            this.emit('error', err);
+            this.destroy(err);
         });
     }
     async runNextQuery() {
@@ -162,6 +162,7 @@ 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)),
                 maxAttempts: 5,
                 delay: 5000,
                 delayMultiplier: 2,
@@ -174,9 +175,21 @@ export class DatastoreStreamReadable extends Readable {
                 table,
                 rowsRetrieved: this.rowsRetrieved,
             }, err);
-            this.emit('error', err);
             clearInterval(this.maxWaitInterval);
+            this.destroy(err);
             return;
         }
     }
 }
+// Examples of errors:
+// UNKNOWN: Stream removed
+const RETRY_ON = [
+    'GOAWAY',
+    'UNAVAILABLE',
+    'UNKNOWN',
+    'DEADLINE_EXCEEDED',
+    'ABORTED',
+    'much contention',
+    'try again',
+    'timeout',
+].map(s => s.toLowerCase());

package/package.json

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

package/src/datastore.db.ts

@@ -352,7 +352,7 @@ export class DatastoreDB extends BaseCommonDB implements CommonDB {
         ? new DatastoreStreamReadable<ROW>(q, opt)
         : (ds.runQueryStream(q, this.getRunQueryOptions(opt)) as ReadableTyped<ROW>)
       )
-        .on('error', err => transform.emit('error', err))
+        .on('error', err => transform.destroy(err))
         .pipe(transform)
     })
 

package/src/datastoreStreamReadable.ts

@@ -125,7 +125,7 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
 
     void this.runNextQuery().catch(err => {
       this.logger.error('error in runNextQuery', err)
-      this.emit('error', err)
+      this.destroy(err)
     })
   }
 
@@ -217,6 +217,7 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
         },
         {
           name: `DatastoreStreamReadable.query(${table})`,
+          predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
           maxAttempts: 5,
           delay: 5000,
           delayMultiplier: 2,
@@ -233,9 +234,22 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
         },
         err,
       )
-      this.emit('error', err)
       clearInterval(this.maxWaitInterval)
+      this.destroy(err as Error)
       return
     }
   }
 }
+
+// Examples of errors:
+// UNKNOWN: Stream removed
+const RETRY_ON = [
+  'GOAWAY',
+  'UNAVAILABLE',
+  'UNKNOWN',
+  'DEADLINE_EXCEEDED',
+  'ABORTED',
+  'much contention',
+  'try again',
+  'timeout',
+].map(s => s.toLowerCase())