@naturalcycles/datastore-lib 3.29.0 → 3.30.0

package/dist/DatastoreStreamReadable.js

@@ -26,24 +26,28 @@ class DatastoreStreamReadable extends node_stream_1.Readable {
             batchSize: 1000,
             ...opt,
         };
-        if (this.opt.maxWait) {
+        this.originalLimit = q.limitVal;
+        this.table = q.kinds[0];
+        logger.log(`!! using experimentalCursorStream !! ${this.table}, batchSize: ${opt.batchSize}`);
+        const { maxWait } = this.opt;
+        if (maxWait) {
+            this.logger.warn(`!! ${this.table} maxWait ${maxWait}`);
             this.maxWaitInterval = setInterval(() => {
-                if (Date.now() - this.lastReadTimestamp < this.opt.maxWait * 1000) {
+                const millisSinceLastRead = Date.now() - this.lastReadTimestamp;
+                if (millisSinceLastRead < maxWait * 1000) {
+                    this.logger.warn(`!! ${this.table} millisSinceLastRead(${millisSinceLastRead}) < maxWait*1000`);
                     return;
                 }
                 const { running, rowsRetrieved } = this;
-                this.logger.warn(`maxWait of ${this.opt.maxWait} seconds reached, force-triggering _read`, {
+                this.logger.warn(`maxWait of ${maxWait} seconds reached, force-triggering _read`, {
                     running,
                     rowsRetrieved,
                 });
                 // force-trigger _read
                 // regardless of `running` status
                 this._read();
-            }, (this.opt.maxWait * 1000) / 2);
+            }, (maxWait * 1000) / 2);
         }
-        this.originalLimit = q.limitVal;
-        this.table = q.kinds[0];
-        logger.log(`!! using experimentalCursorStream !! ${this.table}, batchSize: ${opt.batchSize}`);
     }
     async runNextQuery() {
         if (this.done)
@@ -85,6 +89,7 @@ class DatastoreStreamReadable extends node_stream_1.Readable {
                 rowsRetrieved: this.rowsRetrieved,
             }, err);
             this.emit('error', err);
+            clearInterval(this.maxWaitInterval);
             return;
         }
         this.rowsRetrieved += rows.length;

package/package.json

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

package/src/DatastoreStreamReadable.ts

@@ -35,34 +35,39 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
       ...opt,
     }
 
-    if (this.opt.maxWait) {
+    this.originalLimit = q.limitVal
+    this.table = q.kinds[0]!
+
+    logger.log(`!! using experimentalCursorStream !! ${this.table}, batchSize: ${opt.batchSize}`)
+
+    const { maxWait } = this.opt
+    if (maxWait) {
+      this.logger.warn(`!! ${this.table} maxWait ${maxWait}`)
+
       this.maxWaitInterval = setInterval(
         () => {
-          if (Date.now() - this.lastReadTimestamp < this.opt.maxWait! * 1000) {
+          const millisSinceLastRead = Date.now() - this.lastReadTimestamp
+
+          if (millisSinceLastRead < maxWait * 1000) {
+            this.logger.warn(
+              `!! ${this.table} millisSinceLastRead(${millisSinceLastRead}) < maxWait*1000`,
+            )
             return
           }
 
           const { running, rowsRetrieved } = this
-          this.logger.warn(
-            `maxWait of ${this.opt.maxWait} seconds reached, force-triggering _read`,
-            {
-              running,
-              rowsRetrieved,
-            },
-          )
+          this.logger.warn(`maxWait of ${maxWait} seconds reached, force-triggering _read`, {
+            running,
+            rowsRetrieved,
+          })
 
           // force-trigger _read
           // regardless of `running` status
           this._read()
         },
-        (this.opt.maxWait * 1000) / 2,
+        (maxWait * 1000) / 2,
       )
     }
-
-    this.originalLimit = q.limitVal
-    this.table = q.kinds[0]!
-
-    logger.log(`!! using experimentalCursorStream !! ${this.table}, batchSize: ${opt.batchSize}`)
   }
 
   private async runNextQuery(): Promise<void> {
@@ -117,6 +122,7 @@ export class DatastoreStreamReadable<T = any> extends Readable implements Readab
         err,
       )
       this.emit('error', err)
+      clearInterval(this.maxWaitInterval)
       return
     }