@naturalcycles/firestore-lib 2.12.0 → 2.12.1

package/dist/firestoreShardedReadable.js

@@ -65,7 +65,7 @@ export class FirestoreShardedReadable extends Readable {
         }
         void this.runNextQuery(shard).catch(err => {
             this.logger.error('error in runNextQuery', err);
-            this.emit('error', err);
+            this.destroy(err);
         });
     }
     async runNextQuery(shard) {
@@ -155,7 +155,7 @@ export class FirestoreShardedReadable extends Readable {
                 table,
                 rowsRetrieved: this.rowsRetrieved,
             }, err);
-            this.emit('error', err);
+            this.destroy(err);
             return;
         }
     }

package/dist/firestoreStreamReadable.js

@@ -62,7 +62,7 @@ export class FirestoreStreamReadable extends Readable {
         }
         void this.runNextQuery().catch(err => {
             this.logger.error('error in runNextQuery', err);
-            this.emit('error', err);
+            this.destroy(err);
         });
     }
     async runNextQuery() {
@@ -137,6 +137,7 @@ export class FirestoreStreamReadable extends Readable {
                 return await q.get();
             }, {
                 name: `FirestoreStreamReadable.query(${table})`,
+                predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
                 maxAttempts: 5,
                 delay: 5000,
                 delayMultiplier: 2,
@@ -149,8 +150,20 @@ export class FirestoreStreamReadable extends Readable {
                 table,
                 rowsRetrieved: this.rowsRetrieved,
             }, err);
-            this.emit('error', err);
+            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

@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/firestoreShardedReadable.ts

@@ -91,7 +91,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     }
     void this.runNextQuery(shard).catch(err => {
       this.logger.error('error in runNextQuery', err)
-      this.emit('error', err)
+      this.destroy(err)
     })
   }
 
@@ -213,7 +213,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
         },
         err,
       )
-      this.emit('error', err)
+      this.destroy(err as Error)
       return
     }
   }

package/src/firestoreStreamReadable.ts

@@ -85,7 +85,7 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
 
     void this.runNextQuery().catch(err => {
       this.logger.error('error in runNextQuery', err)
-      this.emit('error', err)
+      this.destroy(err)
     })
   }
 
@@ -177,6 +177,7 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
         },
         {
           name: `FirestoreStreamReadable.query(${table})`,
+          predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
           maxAttempts: 5,
           delay: 5000,
           delayMultiplier: 2,
@@ -193,8 +194,21 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
         },
         err,
       )
-      this.emit('error', err)
+      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())