@naturalcycles/firestore-lib 2.10.1 → 2.11.0

package/dist/firestoreStreamReadable.js

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { FieldPath } from '@google-cloud/firestore';
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
-import { _since } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { unescapeDocId } from './firestore.util.js';
 export class FirestoreStreamReadable extends Readable {
@@ -56,7 +56,6 @@ export class FirestoreStreamReadable extends Readable {
         }
         if (this.queryIsRunning) {
             this.logger.log(`_read #${this.countReads}, queryIsRunning: true, doing nothing`);
-            // todo: check if this can cause a "hang", if no more _reads would come later and we get stuck?
             return;
         }
         void this.runNextQuery().catch(err => {
@@ -73,7 +72,6 @@ export class FirestoreStreamReadable extends Readable {
         if (this.originalLimit) {
             limit = Math.min(this.opt.batchSize, this.originalLimit - this.rowsRetrieved);
         }
-        // console.log(`limit: ${limit}`)
         // We have to orderBy documentId, to be able to use id as a cursor
         let q = this.q.orderBy(FieldPath.documentId()).limit(limit);
         if (this.endCursor) {
@@ -85,7 +83,7 @@ export class FirestoreStreamReadable extends Readable {
         // })
         const started = localTime.nowUnixMillis();
         const qs = await this.runQuery(q);
-        logger.log(`${table} query took ${_since(started)}`);
+        const queryTook = Date.now() - started;
         if (!qs) {
             // error already emitted in runQuery
             return;
@@ -100,7 +98,7 @@ export class FirestoreStreamReadable extends Readable {
             });
         }
         this.rowsRetrieved += rows.length;
-        logger.log(`${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved`);
+        logger.log(`${table} got ${rows.length} rows in ${_ms(queryTook)}, ${this.rowsRetrieved} rowsRetrieved`);
         this.endCursor = lastDocId;
         this.queryIsRunning = false; // ready to take more _reads
         let shouldContinue = false;

package/package.json

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

package/src/firestoreStreamReadable.ts

@@ -2,7 +2,7 @@ import { Readable } from 'node:stream'
 import { FieldPath, type Query, type QuerySnapshot } from '@google-cloud/firestore'
 import type { DBQuery } from '@naturalcycles/db-lib'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
-import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
 import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
@@ -78,7 +78,6 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
 
     if (this.queryIsRunning) {
       this.logger.log(`_read #${this.countReads}, queryIsRunning: true, doing nothing`)
-      // todo: check if this can cause a "hang", if no more _reads would come later and we get stuck?
       return
     }
 
@@ -100,7 +99,6 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
       limit = Math.min(this.opt.batchSize, this.originalLimit - this.rowsRetrieved)
     }
 
-    // console.log(`limit: ${limit}`)
     // We have to orderBy documentId, to be able to use id as a cursor
     let q = this.q.orderBy(FieldPath.documentId()).limit(limit)
     if (this.endCursor) {
@@ -114,7 +112,7 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
 
     const started = localTime.nowUnixMillis()
     const qs = await this.runQuery(q)
-    logger.log(`${table} query took ${_since(started)}`)
+    const queryTook = Date.now() - started
     if (!qs) {
       // error already emitted in runQuery
       return
@@ -132,7 +130,9 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     }
 
     this.rowsRetrieved += rows.length
-    logger.log(`${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved`)
+    logger.log(
+      `${table} got ${rows.length} rows in ${_ms(queryTook)}, ${this.rowsRetrieved} rowsRetrieved`,
+    )
 
     this.endCursor = lastDocId
     this.queryIsRunning = false // ready to take more _reads