@naturalcycles/firestore-lib 2.21.0 → 2.22.0

package/dist/firestoreShardedReadable.js

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
 import { FieldPath } from '@google-cloud/firestore';
-import { localTime } from '@naturalcycles/js-lib/datetime';
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
@@ -76,7 +76,7 @@ export class FirestoreShardedReadable extends Readable {
             return;
         const { logger, table } = this;
         if (this.lastQueryDoneByShard[shard]) {
-            this.totalWait += Date.now() - this.lastQueryDoneByShard[shard];
+            this.totalWait += nowUnixMillis() - this.lastQueryDoneByShard[shard];
         }
         this.queryIsRunningByShard[shard] = true;
         const limit = this.opt.batchSize;
@@ -107,7 +107,7 @@ export class FirestoreShardedReadable extends Readable {
         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();
+        this.lastQueryDoneByShard[shard] = nowUnixMillis();
         for (const row of rows) {
             this.push(row);
         }

package/dist/firestoreStreamReadable.js

@@ -1,6 +1,6 @@
 import { Readable } from 'node:stream';
 import { FieldPath } from '@google-cloud/firestore';
-import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { TimeoutError } from '@naturalcycles/js-lib/error/error.util.js';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
@@ -89,9 +89,9 @@ export class FirestoreStreamReadable extends Readable {
         //   rowsRetrieved: this.rowsRetrieved,
         //   paused: this.paused,
         // })
-        const started = localTime.nowUnixMillis();
+        const started = nowUnixMillis();
         const qs = await this.runQuery(q);
-        const queryTook = Date.now() - started;
+        const queryTook = nowUnixMillis() - started;
         if (!qs) {
             // error already emitted in runQuery
             return;

package/dist/query.util.js

@@ -1,11 +1,12 @@
 import { FieldPath, Timestamp } from '@google-cloud/firestore';
 import { _round } from '@naturalcycles/js-lib';
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 export function readAtToReadTime(opt) {
     if (!opt.readAt)
         return;
     // Same logic as Datastore: round to whole minutes, guard against future
     let readTimeMs = _round(opt.readAt, 60) * 1000;
-    if (readTimeMs >= Date.now() - 1000) {
+    if (readTimeMs >= nowUnixMillis() - 1000) {
         readTimeMs -= 60_000;
     }
     return Timestamp.fromMillis(readTimeMs);

package/package.json

@@ -9,7 +9,7 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "20.68.0",
+    "@naturalcycles/dev-lib": "20.71.0",
     "@types/node": "^26",
     "typescript": "^7",
     "firebase-admin": "^14"
@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=26.12.1"
   },
-  "version": "2.21.0",
+  "version": "2.22.0",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/firestoreShardedReadable.ts

@@ -2,7 +2,7 @@ import { Readable } from 'node:stream'
 import { FieldPath } from '@google-cloud/firestore'
 import type { Query, QuerySnapshot } from '@google-cloud/firestore'
 import type { DBQuery } from '@naturalcycles/db-lib'
-import { localTime } from '@naturalcycles/js-lib/datetime'
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
@@ -107,7 +107,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
     const { logger, table } = this
 
     if (this.lastQueryDoneByShard[shard]) {
-      this.totalWait += Date.now() - this.lastQueryDoneByShard[shard]
+      this.totalWait += nowUnixMillis() - this.lastQueryDoneByShard[shard]
     }
 
     this.queryIsRunningByShard[shard] = true
@@ -151,7 +151,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
 
     this.cursorByShard[shard] = lastDocId
     this.queryIsRunningByShard[shard] = false // ready to take more _reads
-    this.lastQueryDoneByShard[shard] = localTime.nowUnixMillis()
+    this.lastQueryDoneByShard[shard] = nowUnixMillis()
 
     for (const row of rows) {
       this.push(row)

package/src/firestoreStreamReadable.ts

@@ -7,7 +7,7 @@ import type {
   Timestamp,
 } from '@google-cloud/firestore'
 import type { DBQuery } from '@naturalcycles/db-lib'
-import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
 import { TimeoutError } from '@naturalcycles/js-lib/error/error.util.js'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
@@ -125,9 +125,9 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     //   paused: this.paused,
     // })
 
-    const started = localTime.nowUnixMillis()
+    const started = nowUnixMillis()
     const qs = await this.runQuery(q)
-    const queryTook = Date.now() - started
+    const queryTook = nowUnixMillis() - started
     if (!qs) {
       // error already emitted in runQuery
       return

package/src/query.util.ts

@@ -2,6 +2,7 @@ import { FieldPath, Timestamp } from '@google-cloud/firestore'
 import type { Query, WhereFilterOp } from '@google-cloud/firestore'
 import type { CommonDBReadOptions, DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import { _round } from '@naturalcycles/js-lib'
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 
 export function readAtToReadTime(opt: CommonDBReadOptions): Timestamp | undefined {
@@ -9,7 +10,7 @@ export function readAtToReadTime(opt: CommonDBReadOptions): Timestamp | undefine
 
   // Same logic as Datastore: round to whole minutes, guard against future
   let readTimeMs = _round(opt.readAt, 60) * 1000
-  if (readTimeMs >= Date.now() - 1000) {
+  if (readTimeMs >= nowUnixMillis() - 1000) {
     readTimeMs -= 60_000
   }