@naturalcycles/firestore-lib 2.10.1 → 2.12.0

package/dist/firestore.db.d.ts

@@ -1,7 +1,7 @@
 import type { Firestore, Query, QuerySnapshot, Transaction } from '@google-cloud/firestore';
 import type { CommonDB, CommonDBOptions, CommonDBReadOptions, CommonDBSaveOptions, CommonDBSupport, CommonDBTransactionOptions, DBQuery, DBTransaction, DBTransactionFn, RunQueryResult } from '@naturalcycles/db-lib';
 import { BaseCommonDB } from '@naturalcycles/db-lib';
-import { type CommonLogger } from '@naturalcycles/js-lib/log';
+import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log';
 import type { ObjectWithId, PositiveInteger, StringMap } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 export declare class FirestoreDB extends BaseCommonDB implements CommonDB {
@@ -55,6 +55,7 @@ export interface FirestoreDBCfg {
      * Default to `console`
      */
     logger?: CommonLogger;
+    logLevel?: CommonLogLevel;
 }
 export declare class RollbackError extends Error {
     constructor();
@@ -82,12 +83,12 @@ export interface FirestoreDBStreamOptions extends FirestoreDBReadOptions {
      * between the queries.
      */
     highWaterMark?: PositiveInteger;
+    logger?: CommonLogger;
     /**
-     * Set to `true` to log additional debug info, when using experimentalCursorStream.
-     *
-     * @default false
+     * Defaults to `log`.
+     * Set to `debug` to allow for extra debugging, e.g in experimentalCursorStream.
      */
-    debug?: boolean;
+    logLevel?: CommonLogLevel;
 }
 export interface FirestoreDBOptions extends CommonDBOptions {
 }

package/dist/firestore.db.js

@@ -3,7 +3,6 @@ import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib';
 import { _isTruthy } from '@naturalcycles/js-lib';
 import { _chunk } from '@naturalcycles/js-lib/array/array.util.js';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
-import { commonLoggerMinLevel } from '@naturalcycles/js-lib/log';
 import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object/object.util.js';
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { _stringMapEntries } from '@naturalcycles/js-lib/types';
@@ -96,14 +95,16 @@ export class FirestoreDB extends BaseCommonDB {
     streamQuery(q, opt_) {
         const firestoreQuery = dbQueryToFirestoreQuery(q, this.cfg.firestore.collection(q.table));
         const opt = {
+            logger: this.cfg.logger,
+            logLevel: this.cfg.logLevel,
             ...this.cfg.streamOptions,
             ...opt_,
         };
         if (opt.experimentalCursorStream) {
-            return new FirestoreStreamReadable(firestoreQuery, q, opt, commonLoggerMinLevel(this.cfg.logger, opt.debug ? 'log' : 'warn'));
+            return new FirestoreStreamReadable(firestoreQuery, q, opt);
         }
         if (opt.experimentalShardedStream) {
-            return new FirestoreShardedReadable(firestoreQuery, q, opt, commonLoggerMinLevel(this.cfg.logger, opt.debug ? 'log' : 'warn'));
+            return new FirestoreShardedReadable(firestoreQuery, q, opt);
         }
         return firestoreQuery.stream().map(doc => {
             return {

package/dist/firestoreShardedReadable.d.ts

@@ -1,7 +1,6 @@
 import { Readable } from 'node:stream';
 import { type Query } from '@google-cloud/firestore';
 import type { DBQuery } from '@naturalcycles/db-lib';
-import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { FirestoreDBStreamOptions } from './firestore.db.js';
@@ -11,7 +10,6 @@ import type { FirestoreDBStreamOptions } from './firestore.db.js';
 export declare class FirestoreShardedReadable<T extends ObjectWithId = any> extends Readable implements ReadableTyped<T> {
     private readonly q;
     readonly dbQuery: DBQuery<T>;
-    private logger;
     private readonly table;
     private readonly originalLimit;
     private rowsRetrieved;
@@ -27,7 +25,8 @@ export declare class FirestoreShardedReadable<T extends ObjectWithId = any> exte
     private lastQueryDoneByShard;
     private totalWait;
     private readonly opt;
-    constructor(q: Query, dbQuery: DBQuery<T>, opt: FirestoreDBStreamOptions, logger: CommonLogger);
+    private logger;
+    constructor(q: Query, dbQuery: DBQuery<T>, opt: FirestoreDBStreamOptions);
     /**
      * Counts how many times _read was called.
      * For debugging.

package/dist/firestoreShardedReadable.js

@@ -2,6 +2,7 @@ import { Readable } from 'node:stream';
 import { FieldPath } from '@google-cloud/firestore';
 import { localTime } from '@naturalcycles/js-lib/datetime';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { unescapeDocId } from './firestore.util.js';
 const SHARDS = 16;
@@ -12,7 +13,6 @@ const SHARD_COLUMN = 'shard16';
 export class FirestoreShardedReadable extends Readable {
     q;
     dbQuery;
-    logger;
     table;
     originalLimit;
     rowsRetrieved = 0;
@@ -29,18 +29,20 @@ export class FirestoreShardedReadable extends Readable {
     lastQueryDoneByShard = {};
     totalWait = 0;
     opt;
-    constructor(q, dbQuery, opt, logger) {
+    logger;
+    constructor(q, dbQuery, opt) {
         super({ objectMode: true });
         this.q = q;
         this.dbQuery = dbQuery;
-        this.logger = logger;
         this.opt = {
             batchSize: 3000,
             ...opt,
         };
         this.originalLimit = dbQuery._limitValue;
         this.table = dbQuery.table;
-        logger.warn(`!! using experimentalShardedStream !! ${this.table}, batchSize: ${this.opt.batchSize}`);
+        const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel);
+        this.logger = logger;
+        logger.log(`!! using experimentalShardedStream !! ${this.table}, batchSize: ${this.opt.batchSize}`);
     }
     /**
      * Counts how many times _read was called.
@@ -52,17 +54,17 @@ export class FirestoreShardedReadable extends Readable {
         // console.log(`_read called ${++this.count}, wasRunning: ${this.running}`) // debugging
         this.count++;
         if (this.done) {
-            this.logger.warn(`!!! _read was called, but done==true`);
+            this.logger.log(`!!! _read was called, but done==true`);
             return;
         }
         // const shard = this.getNextShardAndMove()
         const shard = this.findNextFreeShard();
         if (!shard) {
-            this.logger.log(`_read ${this.count}: all shards are busy, skipping`);
+            this.logger.debug(`_read ${this.count}: all shards are busy, skipping`);
             return;
         }
         void this.runNextQuery(shard).catch(err => {
-            console.log('error in runNextQuery', err);
+            this.logger.error('error in runNextQuery', err);
             this.emit('error', err);
         });
     }
@@ -80,7 +82,7 @@ export class FirestoreShardedReadable extends Readable {
         if (this.cursorByShard[shard]) {
             q = q.startAfter(this.cursorByShard[shard]);
         }
-        console.log(`runNextQuery[${shard}]`, {
+        logger.debug(`runNextQuery[${shard}]`, {
             retrieved: this.rowsRetrieved,
         });
         const qs = await this.runQuery(q);
@@ -98,7 +100,7 @@ export class FirestoreShardedReadable extends Readable {
             });
         }
         this.rowsRetrieved += rows.length;
-        logger.log(`${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
+        logger.debug(`${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
         this.cursorByShard[shard] = lastDocId;
         this.queryIsRunningByShard[shard] = false; // ready to take more _reads
         this.lastQueryDoneByShard[shard] = localTime.nowUnixMillis();
@@ -106,18 +108,18 @@ export class FirestoreShardedReadable extends Readable {
             this.push(row);
         }
         if (qs.empty) {
-            logger.warn(`!!!! Shard ${shard} DONE! ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
+            logger.log(`!!!! Shard ${shard} DONE! ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
             this.doneShards.add(shard);
         }
         if (this.doneShards.size === SHARDS) {
-            logger.warn(`!!!! DONE: all shards completed, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
+            logger.log(`!!!! DONE: all shards completed, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
             this.push(null);
             this.paused = false;
             this.done = true;
             return;
         }
         if (this.originalLimit && this.rowsRetrieved >= this.originalLimit) {
-            logger.warn(`!!!! DONE: reached total limit of ${this.originalLimit}, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
+            logger.log(`!!!! DONE: reached total limit of ${this.originalLimit}, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`);
             this.push(null);
             this.paused = false;
             this.done = true;
@@ -131,7 +133,7 @@ export class FirestoreShardedReadable extends Readable {
             void this.runNextQuery(nextShard);
         }
         else {
-            logger.warn(`${table} all shards are busy in runNextQuery, skipping`);
+            logger.log(`${table} all shards are busy in runNextQuery, skipping`);
         }
     }
     async runQuery(q) {
@@ -149,7 +151,7 @@ export class FirestoreShardedReadable extends Readable {
             });
         }
         catch (err) {
-            console.log(`FirestoreStreamReadable error!\n`, {
+            logger.error(`FirestoreStreamReadable error!\n`, {
                 table,
                 rowsRetrieved: this.rowsRetrieved,
             }, err);

package/dist/firestoreStreamReadable.d.ts

@@ -1,13 +1,11 @@
 import { Readable } from 'node:stream';
 import { type Query } from '@google-cloud/firestore';
 import type { DBQuery } from '@naturalcycles/db-lib';
-import type { CommonLogger } from '@naturalcycles/js-lib/log';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';
 import type { FirestoreDBStreamOptions } from './firestore.db.js';
 export declare class FirestoreStreamReadable<T extends ObjectWithId = any> extends Readable implements ReadableTyped<T> {
     private q;
-    private logger;
     private readonly table;
     private readonly originalLimit;
     private rowsRetrieved;
@@ -21,7 +19,8 @@ export declare class FirestoreStreamReadable<T extends ObjectWithId = any> exten
      */
     countReads: number;
     private readonly opt;
-    constructor(q: Query, dbQuery: DBQuery<T>, opt: FirestoreDBStreamOptions, logger: CommonLogger);
+    private logger;
+    constructor(q: Query, dbQuery: DBQuery<T>, opt: FirestoreDBStreamOptions);
     _read(): void;
     private runNextQuery;
     private runQuery;

package/dist/firestoreStreamReadable.js

@@ -1,12 +1,12 @@
 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 { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { unescapeDocId } from './firestore.util.js';
 export class FirestoreStreamReadable extends Readable {
     q;
-    logger;
     table;
     originalLimit;
     rowsRetrieved = 0;
@@ -20,14 +20,14 @@ export class FirestoreStreamReadable extends Readable {
      */
     countReads = 0;
     opt;
-    constructor(q, dbQuery, opt, logger) {
+    logger;
+    constructor(q, dbQuery, opt) {
         // 10_000 was optimal in benchmarks
         const { batchSize = 10_000 } = opt;
         const { highWaterMark = batchSize * 3 } = opt;
         // Defaulting highWaterMark to 3x batchSize
         super({ objectMode: true, highWaterMark });
         this.q = q;
-        this.logger = logger;
         this.opt = {
             ...opt,
             batchSize,
@@ -36,7 +36,9 @@ export class FirestoreStreamReadable extends Readable {
         // todo: support PITR!
         this.originalLimit = dbQuery._limitValue;
         this.table = dbQuery.table;
-        logger.warn(`!!! using experimentalCursorStream`, {
+        const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel);
+        this.logger = logger;
+        logger.log(`!!! using experimentalCursorStream`, {
             table: this.table,
             batchSize,
             highWaterMark,
@@ -55,12 +57,11 @@ export class FirestoreStreamReadable extends Readable {
             this.paused = false;
         }
         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?
+            this.logger.debug(`_read #${this.countReads}, queryIsRunning: true, doing nothing`);
             return;
         }
         void this.runNextQuery().catch(err => {
-            console.log('error in runNextQuery', err);
+            this.logger.error('error in runNextQuery', err);
             this.emit('error', err);
         });
     }
@@ -73,7 +74,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 +85,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 +100,7 @@ export class FirestoreStreamReadable extends Readable {
             });
         }
         this.rowsRetrieved += rows.length;
-        logger.log(`${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved`);
+        logger.debug(`${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;
@@ -108,7 +108,7 @@ export class FirestoreStreamReadable extends Readable {
             shouldContinue = this.push(row);
         }
         if (!rows.length || (this.originalLimit && this.rowsRetrieved >= this.originalLimit)) {
-            logger.warn(`${table} DONE! ${this.rowsRetrieved} rowsRetrieved`);
+            logger.log(`${table} DONE! ${this.rowsRetrieved} rowsRetrieved`);
             this.push(null);
             this.done = true;
             this.paused = false;
@@ -116,13 +116,13 @@ export class FirestoreStreamReadable extends Readable {
         }
         if (shouldContinue) {
             // Keep the stream flowing
-            logger.log(`${table} continuing the stream`);
+            logger.debug(`${table} continuing the stream`);
             void this.runNextQuery();
         }
         else {
             // Not starting the next query
             if (this.paused) {
-                logger.log(`${table} stream is already paused`);
+                logger.debug(`${table} stream is already paused`);
             }
             else {
                 logger.log(`${table} pausing the stream`);
@@ -145,7 +145,7 @@ export class FirestoreStreamReadable extends Readable {
             });
         }
         catch (err) {
-            console.log(`FirestoreStreamReadable error!\n`, {
+            logger.error(`FirestoreStreamReadable error!\n`, {
                 table,
                 rowsRetrieved: this.rowsRetrieved,
             }, err);

package/package.json

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

package/src/firestore.db.ts

@@ -25,7 +25,7 @@ import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib'
 import { _isTruthy } from '@naturalcycles/js-lib'
 import { _chunk } from '@naturalcycles/js-lib/array/array.util.js'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
-import { type CommonLogger, commonLoggerMinLevel } from '@naturalcycles/js-lib/log'
+import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
 import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object/object.util.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { ObjectWithId, PositiveInteger, StringMap } from '@naturalcycles/js-lib/types'
@@ -156,26 +156,18 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
     const firestoreQuery = dbQueryToFirestoreQuery(q, this.cfg.firestore.collection(q.table))
 
     const opt: FirestoreDBStreamOptions = {
+      logger: this.cfg.logger,
+      logLevel: this.cfg.logLevel,
       ...this.cfg.streamOptions,
       ...opt_,
     }
 
     if (opt.experimentalCursorStream) {
-      return new FirestoreStreamReadable(
-        firestoreQuery,
-        q,
-        opt,
-        commonLoggerMinLevel(this.cfg.logger, opt.debug ? 'log' : 'warn'),
-      )
+      return new FirestoreStreamReadable(firestoreQuery, q, opt)
     }
 
     if (opt.experimentalShardedStream) {
-      return new FirestoreShardedReadable(
-        firestoreQuery,
-        q,
-        opt,
-        commonLoggerMinLevel(this.cfg.logger, opt.debug ? 'log' : 'warn'),
-      )
+      return new FirestoreShardedReadable(firestoreQuery, q, opt)
     }
 
     return (firestoreQuery.stream() as ReadableTyped<QueryDocumentSnapshot<any>>).map(doc => {
@@ -534,6 +526,8 @@ export interface FirestoreDBCfg {
    * Default to `console`
    */
   logger?: CommonLogger
+
+  logLevel?: CommonLogLevel
 }
 
 const methodMap: Record<CommonDBSaveMethod, SaveOp> = {
@@ -575,12 +569,13 @@ export interface FirestoreDBStreamOptions extends FirestoreDBReadOptions {
    */
   highWaterMark?: PositiveInteger
 
+  logger?: CommonLogger
+
   /**
-   * Set to `true` to log additional debug info, when using experimentalCursorStream.
-   *
-   * @default false
+   * Defaults to `log`.
+   * Set to `debug` to allow for extra debugging, e.g in experimentalCursorStream.
    */
-  debug?: boolean
+  logLevel?: CommonLogLevel
 }
 
 export interface FirestoreDBOptions extends CommonDBOptions {}

package/src/firestoreShardedReadable.ts

@@ -3,7 +3,7 @@ import { FieldPath, type Query, type QuerySnapshot } from '@google-cloud/firesto
 import type { DBQuery } from '@naturalcycles/db-lib'
 import { localTime } from '@naturalcycles/js-lib/datetime'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
-import type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { type CommonLogger, createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import type {
   ObjectWithId,
@@ -42,12 +42,12 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
   private totalWait = 0
 
   private readonly opt: FirestoreDBStreamOptions & { batchSize: number }
+  private logger: CommonLogger
 
   constructor(
     private readonly q: Query,
     readonly dbQuery: DBQuery<T>,
     opt: FirestoreDBStreamOptions,
-    private logger: CommonLogger,
   ) {
     super({ objectMode: true })
 
@@ -58,8 +58,10 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
 
     this.originalLimit = dbQuery._limitValue
     this.table = dbQuery.table
+    const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel)
+    this.logger = logger
 
-    logger.warn(
+    logger.log(
       `!! using experimentalShardedStream !! ${this.table}, batchSize: ${this.opt.batchSize}`,
     )
   }
@@ -77,18 +79,18 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     this.count++
 
     if (this.done) {
-      this.logger.warn(`!!! _read was called, but done==true`)
+      this.logger.log(`!!! _read was called, but done==true`)
       return
     }
 
     // const shard = this.getNextShardAndMove()
     const shard = this.findNextFreeShard()
     if (!shard) {
-      this.logger.log(`_read ${this.count}: all shards are busy, skipping`)
+      this.logger.debug(`_read ${this.count}: all shards are busy, skipping`)
       return
     }
     void this.runNextQuery(shard).catch(err => {
-      console.log('error in runNextQuery', err)
+      this.logger.error('error in runNextQuery', err)
       this.emit('error', err)
     })
   }
@@ -112,7 +114,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
       q = q.startAfter(this.cursorByShard[shard])
     }
 
-    console.log(`runNextQuery[${shard}]`, {
+    logger.debug(`runNextQuery[${shard}]`, {
       retrieved: this.rowsRetrieved,
     })
     const qs = await this.runQuery(q)
@@ -133,7 +135,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     }
 
     this.rowsRetrieved += rows.length
-    logger.log(
+    logger.debug(
       `${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(
         this.totalWait,
       )}`,
@@ -148,14 +150,14 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     }
 
     if (qs.empty) {
-      logger.warn(
+      logger.log(
         `!!!! Shard ${shard} DONE! ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`,
       )
       this.doneShards.add(shard)
     }
 
     if (this.doneShards.size === SHARDS) {
-      logger.warn(
+      logger.log(
         `!!!! DONE: all shards completed, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`,
       )
       this.push(null)
@@ -165,7 +167,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     }
 
     if (this.originalLimit && this.rowsRetrieved >= this.originalLimit) {
-      logger.warn(
+      logger.log(
         `!!!! DONE: reached total limit of ${this.originalLimit}, ${this.rowsRetrieved} rowsRetrieved, totalWait: ${_ms(this.totalWait)}`,
       )
       this.push(null)
@@ -181,7 +183,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     if (nextShard) {
       void this.runNextQuery(nextShard)
     } else {
-      logger.warn(`${table} all shards are busy in runNextQuery, skipping`)
+      logger.log(`${table} all shards are busy in runNextQuery, skipping`)
     }
   }
 
@@ -203,7 +205,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
         },
       )
     } catch (err) {
-      console.log(
+      logger.error(
         `FirestoreStreamReadable error!\n`,
         {
           table,

package/src/firestoreStreamReadable.ts

@@ -2,8 +2,8 @@ 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 type { CommonLogger } from '@naturalcycles/js-lib/log'
+import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
+import { type CommonLogger, createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
@@ -28,12 +28,12 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
   countReads = 0
 
   private readonly opt: FirestoreDBStreamOptions & { batchSize: number; highWaterMark: number }
+  private logger: CommonLogger
 
   constructor(
     private q: Query,
     dbQuery: DBQuery<T>,
     opt: FirestoreDBStreamOptions,
-    private logger: CommonLogger,
   ) {
     // 10_000 was optimal in benchmarks
     const { batchSize = 10_000 } = opt
@@ -50,8 +50,10 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
 
     this.originalLimit = dbQuery._limitValue
     this.table = dbQuery.table
+    const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel)
+    this.logger = logger
 
-    logger.warn(`!!! using experimentalCursorStream`, {
+    logger.log(`!!! using experimentalCursorStream`, {
       table: this.table,
       batchSize,
       highWaterMark,
@@ -77,13 +79,12 @@ 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?
+      this.logger.debug(`_read #${this.countReads}, queryIsRunning: true, doing nothing`)
       return
     }
 
     void this.runNextQuery().catch(err => {
-      console.log('error in runNextQuery', err)
+      this.logger.error('error in runNextQuery', err)
       this.emit('error', err)
     })
   }
@@ -100,7 +101,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 +114,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 +132,9 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     }
 
     this.rowsRetrieved += rows.length
-    logger.log(`${table} got ${rows.length} rows, ${this.rowsRetrieved} rowsRetrieved`)
+    logger.debug(
+      `${table} got ${rows.length} rows in ${_ms(queryTook)}, ${this.rowsRetrieved} rowsRetrieved`,
+    )
 
     this.endCursor = lastDocId
     this.queryIsRunning = false // ready to take more _reads
@@ -143,7 +145,7 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     }
 
     if (!rows.length || (this.originalLimit && this.rowsRetrieved >= this.originalLimit)) {
-      logger.warn(`${table} DONE! ${this.rowsRetrieved} rowsRetrieved`)
+      logger.log(`${table} DONE! ${this.rowsRetrieved} rowsRetrieved`)
       this.push(null)
       this.done = true
       this.paused = false
@@ -152,12 +154,12 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
 
     if (shouldContinue) {
       // Keep the stream flowing
-      logger.log(`${table} continuing the stream`)
+      logger.debug(`${table} continuing the stream`)
       void this.runNextQuery()
     } else {
       // Not starting the next query
       if (this.paused) {
-        logger.log(`${table} stream is already paused`)
+        logger.debug(`${table} stream is already paused`)
       } else {
         logger.log(`${table} pausing the stream`)
         this.paused = true
@@ -183,7 +185,7 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
         },
       )
     } catch (err) {
-      console.log(
+      logger.error(
         `FirestoreStreamReadable error!\n`,
         {
           table,