@naturalcycles/db-lib 9.26.0 → 9.26.2

package/dist/adapter/file/file.db.js

@@ -160,7 +160,7 @@ class FileDB extends __1.BaseCommonDB {
         if (this.cfg.logStarted) {
             this.cfg.logger?.log(`>> ${op}`);
         }
-        return Date.now();
+        return js_lib_1.localTime.nowUnixMillis();
     }
     logFinished(started, op) {
         if (!this.cfg.logFinished)

package/dist/adapter/inmemory/inMemory.db.js

@@ -166,7 +166,7 @@ class InMemoryDB {
     async flushToDisk() {
         (0, js_lib_1._assert)(this.cfg.persistenceEnabled, 'flushToDisk() called but persistenceEnabled=false');
         const { persistentStoragePath, persistZip } = this.cfg;
-        const started = Date.now();
+        const started = js_lib_1.localTime.nowUnixMillis();
         await nodejs_lib_1.fs2.emptyDirAsync(persistentStoragePath);
         let tables = 0;
         // infinite concurrency for now
@@ -186,7 +186,7 @@ class InMemoryDB {
     async restoreFromDisk() {
         (0, js_lib_1._assert)(this.cfg.persistenceEnabled, 'restoreFromDisk() called but persistenceEnabled=false');
         const { persistentStoragePath } = this.cfg;
-        const started = Date.now();
+        const started = js_lib_1.localTime.nowUnixMillis();
         await nodejs_lib_1.fs2.ensureDirAsync(persistentStoragePath);
         this.data = {}; // empty it in the beginning!
         const files = (await nodejs_lib_1.fs2.readdirAsync(persistentStoragePath)).filter(f => f.includes('.ndjson'));

package/dist/commondao/common.dao.js

@@ -63,7 +63,7 @@ class CommonDao {
         const op = `getById(${id})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let dbm = (await (opt.tx || this.cfg.db).getByIds(table, [id]))[0];
+        let dbm = (await (opt.tx || this.cfg.db).getByIds(table, [id], opt))[0];
         if (dbm && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
@@ -85,7 +85,7 @@ class CommonDao {
         const op = `getByIdAsDBM(${id})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let [dbm] = await (opt.tx || this.cfg.db).getByIds(table, [id]);
+        let [dbm] = await (opt.tx || this.cfg.db).getByIds(table, [id], opt);
         if (dbm && this.cfg.hooks.afterLoad) {
             dbm = (await this.cfg.hooks.afterLoad(dbm)) || undefined;
         }
@@ -99,7 +99,7 @@ class CommonDao {
         const op = `getByIds ${ids.length} id(s) (${(0, js_lib_1._truncate)(ids.slice(0, 10).join(', '), 50)})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids);
+        let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids, opt);
         if (this.cfg.hooks.afterLoad && dbms.length) {
             dbms = (await (0, js_lib_1.pMap)(dbms, async (dbm) => await this.cfg.hooks.afterLoad(dbm))).filter(js_lib_1._isTruthy);
         }
@@ -113,7 +113,7 @@ class CommonDao {
         const op = `getByIdsAsDBM ${ids.length} id(s) (${(0, js_lib_1._truncate)(ids.slice(0, 10).join(', '), 50)})`;
         const table = opt.table || this.cfg.table;
         const started = this.logStarted(op, table);
-        let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids);
+        let dbms = await (opt.tx || this.cfg.db).getByIds(table, ids, opt);
         if (this.cfg.hooks.afterLoad && dbms.length) {
             dbms = (await (0, js_lib_1.pMap)(dbms, async (dbm) => await this.cfg.hooks.afterLoad(dbm))).filter(js_lib_1._isTruthy);
         }
@@ -978,19 +978,14 @@ class CommonDao {
         }
         else {
             // Joi
-            const start = performance.now();
+            const start = js_lib_1.localTime.nowUnixMillis();
             const vr = (0, nodejs_lib_1.getValidationResult)(obj, schema, objectName);
-            const end = performance.now();
-            const tookMillis = end - start;
-            if (this.cfg.debugValidationTimeThreshhold &&
-                tookMillis >= this.cfg.debugValidationTimeThreshhold) {
-                this.cfg.onValidationTimeThreshold?.({
-                    tookMillis,
-                    error: !!vr.error,
-                    table,
-                    obj,
-                });
-            }
+            const tookMillis = js_lib_1.localTime.nowUnixMillis() - start;
+            this.cfg.onValidationTime?.({
+                tookMillis,
+                table,
+                obj,
+            });
             error = vr.error;
             convertedValue = vr.value;
         }
@@ -1073,7 +1068,7 @@ class CommonDao {
         if (this.cfg.logStarted || force) {
             this.cfg.logger?.log(`>> ${table}.${op}`);
         }
-        return Date.now();
+        return js_lib_1.localTime.nowUnixMillis();
     }
     logSaveStarted(op, items, table) {
         if (this.cfg.logStarted) {
@@ -1093,7 +1088,7 @@ class CommonDao {
             }
             this.cfg.logger?.log(...args);
         }
-        return Date.now();
+        return js_lib_1.localTime.nowUnixMillis();
     }
 }
 exports.CommonDao = CommonDao;

package/dist/commondao/common.dao.model.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject, BaseDBEntity, CommonLogger, ErrorMode, NumberOfMilliseconds, Promisable, UnixTimestamp, ZodError, ZodSchema } from '@naturalcycles/js-lib';
+import { BaseDBEntity, CommonLogger, ErrorMode, NumberOfMilliseconds, Promisable, UnixTimestamp, ZodError, ZodSchema } from '@naturalcycles/js-lib';
 import { AjvSchema, AjvValidationError, JoiValidationError, ObjectSchema, TransformLogProgressOptions, TransformMapOptions } from '@naturalcycles/nodejs-lib';
 import { CommonDB } from '../common.db';
 import { CommonDBCreateOptions, CommonDBOptions, CommonDBSaveOptions } from '../db.model';
@@ -112,14 +112,11 @@ export interface CommonDaoCfg<BM extends BaseDBEntity, DBM extends BaseDBEntity
      */
     validateOnSave?: boolean;
     /**
-     * Defaults to undefined == disabled.
-     * If set - enable the monitoring of validation time and will alert on crossing the threshold.
-     */
-    debugValidationTimeThreshhold?: NumberOfMilliseconds;
-    /**
-     * Called when debugValidationTimeThreshhold is crossed.
+     * The hook allows to get a callback, to instrument "validation time".
+     *
+     * @experimental
      */
-    onValidationTimeThreshold?: (info: AnyObject) => void;
+    onValidationTime?: (data: OnValidationTimeData) => void;
     /**
      * Defaults to false.
      * Setting it to true will set saveMethod to `insert` for save/saveBatch, which will
@@ -288,3 +285,8 @@ export interface CommonDaoStreamOptions<IN> extends CommonDaoReadOptions, Transf
     chunkConcurrency?: number;
 }
 export type CommonDaoCreateOptions = CommonDBCreateOptions;
+export interface OnValidationTimeData {
+    tookMillis: NumberOfMilliseconds;
+    table: string;
+    obj: any;
+}

package/package.json

@@ -45,7 +45,7 @@
   "engines": {
     "node": ">=22.10.0"
   },
-  "version": "9.26.0",
+  "version": "9.26.2",
   "description": "Lowest Common Denominator API to supported Databases",
   "keywords": [
     "db",

package/src/adapter/file/file.db.ts

@@ -9,6 +9,7 @@ import {
   _stringMapValues,
   generateJsonSchemaFromData,
   JsonSchemaRootObject,
+  localTime,
   ObjectWithId,
   UnixTimestampMillis,
 } from '@naturalcycles/js-lib'
@@ -245,7 +246,7 @@ export class FileDB extends BaseCommonDB implements CommonDB {
     if (this.cfg.logStarted) {
       this.cfg.logger?.log(`>> ${op}`)
     }
-    return Date.now() as UnixTimestampMillis
+    return localTime.nowUnixMillis()
   }
 
   private logFinished(started: UnixTimestampMillis, op: string): void {

package/src/adapter/inmemory/inMemory.db.ts

@@ -13,10 +13,10 @@ import {
   generateJsonSchemaFromData,
   JsonSchemaObject,
   JsonSchemaRootObject,
+  localTime,
   ObjectWithId,
   pMap,
   StringMap,
-  UnixTimestampMillis,
 } from '@naturalcycles/js-lib'
 import {
   _pipeline,
@@ -315,7 +315,7 @@ export class InMemoryDB implements CommonDB {
     _assert(this.cfg.persistenceEnabled, 'flushToDisk() called but persistenceEnabled=false')
     const { persistentStoragePath, persistZip } = this.cfg
 
-    const started = Date.now() as UnixTimestampMillis
+    const started = localTime.nowUnixMillis()
 
     await fs2.emptyDirAsync(persistentStoragePath)
 
@@ -344,7 +344,7 @@ export class InMemoryDB implements CommonDB {
     _assert(this.cfg.persistenceEnabled, 'restoreFromDisk() called but persistenceEnabled=false')
     const { persistentStoragePath } = this.cfg
 
-    const started = Date.now() as UnixTimestampMillis
+    const started = localTime.nowUnixMillis()
 
     await fs2.ensureDirAsync(persistentStoragePath)
 

package/src/commondao/common.dao.model.ts

@@ -1,5 +1,4 @@
 import {
-  AnyObject,
   BaseDBEntity,
   CommonLogger,
   ErrorMode,
@@ -149,15 +148,11 @@ export interface CommonDaoCfg<
   validateOnSave?: boolean
 
   /**
-   * Defaults to undefined == disabled.
-   * If set - enable the monitoring of validation time and will alert on crossing the threshold.
-   */
-  debugValidationTimeThreshhold?: NumberOfMilliseconds
-
-  /**
-   * Called when debugValidationTimeThreshhold is crossed.
+   * The hook allows to get a callback, to instrument "validation time".
+   *
+   * @experimental
    */
-  onValidationTimeThreshold?: (info: AnyObject) => void
+  onValidationTime?: (data: OnValidationTimeData) => void
 
   /**
    * Defaults to false.
@@ -365,3 +360,9 @@ export interface CommonDaoStreamOptions<IN>
 }
 
 export type CommonDaoCreateOptions = CommonDBCreateOptions
+
+export interface OnValidationTimeData {
+  tookMillis: NumberOfMilliseconds
+  table: string
+  obj: any
+}

package/src/commondao/common.dao.ts

@@ -123,7 +123,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
 
-    let dbm = (await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id as string]))[0]
+    let dbm = (await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id as string], opt))[0]
     if (dbm && this.cfg.hooks!.afterLoad) {
       dbm = (await this.cfg.hooks!.afterLoad(dbm)) || undefined
     }
@@ -147,7 +147,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     const op = `getByIdAsDBM(${id})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
-    let [dbm] = await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id as string])
+    let [dbm] = await (opt.tx || this.cfg.db).getByIds<DBM>(table, [id as string], opt)
     if (dbm && this.cfg.hooks!.afterLoad) {
       dbm = (await this.cfg.hooks!.afterLoad(dbm)) || undefined
     }
@@ -162,7 +162,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     const op = `getByIds ${ids.length} id(s) (${_truncate(ids.slice(0, 10).join(', '), 50)})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
-    let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids as string[])
+    let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids as string[], opt)
     if (this.cfg.hooks!.afterLoad && dbms.length) {
       dbms = (await pMap(dbms, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _isTruthy,
@@ -179,7 +179,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     const op = `getByIdsAsDBM ${ids.length} id(s) (${_truncate(ids.slice(0, 10).join(', '), 50)})`
     const table = opt.table || this.cfg.table
     const started = this.logStarted(op, table)
-    let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids as string[])
+    let dbms = await (opt.tx || this.cfg.db).getByIds<DBM>(table, ids as string[], opt)
     if (this.cfg.hooks!.afterLoad && dbms.length) {
       dbms = (await pMap(dbms, async dbm => await this.cfg.hooks!.afterLoad!(dbm))).filter(
         _isTruthy,
@@ -1267,22 +1267,15 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
       })
     } else {
       // Joi
-      const start = performance.now()
+      const start = localTime.nowUnixMillis()
       const vr = getValidationResult(obj, schema, objectName)
-      const end = performance.now()
-      const tookMillis = end - start
-
-      if (
-        this.cfg.debugValidationTimeThreshhold &&
-        tookMillis >= this.cfg.debugValidationTimeThreshhold
-      ) {
-        this.cfg.onValidationTimeThreshold?.({
-          tookMillis,
-          error: !!vr.error,
-          table,
-          obj,
-        })
-      }
+      const tookMillis = localTime.nowUnixMillis() - start
+
+      this.cfg.onValidationTime?.({
+        tookMillis,
+        table,
+        obj,
+      })
 
       error = vr.error
       convertedValue = vr.value
@@ -1384,7 +1377,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
     if (this.cfg.logStarted || force) {
       this.cfg.logger?.log(`>> ${table}.${op}`)
     }
-    return Date.now() as UnixTimestampMillis
+    return localTime.nowUnixMillis()
   }
 
   protected logSaveStarted(op: string, items: any, table: string): UnixTimestampMillis {
@@ -1405,7 +1398,7 @@ export class CommonDao<BM extends BaseDBEntity, DBM extends BaseDBEntity = BM, I
       this.cfg.logger?.log(...args)
     }
 
-    return Date.now() as UnixTimestampMillis
+    return localTime.nowUnixMillis()
   }
 }