@naturalcycles/nodejs-lib 15.139.0 → 15.140.0

package/dist/exec2/exec2.js

@@ -1,4 +1,5 @@
 import { execSync, spawn, spawnSync } from 'node:child_process';
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js';
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js';
 import { _substringAfterLast } from '@naturalcycles/js-lib/string/string.util.js';
@@ -53,7 +54,7 @@ class Exec2 {
         const log = opt.log ?? true; // by default log should be true, as we are printing the output
         // Copy, to not mutate the input options
         opt = { ...opt, log, logStart: opt.logStart ?? log, logFinish: opt.logFinish ?? log };
-        const started = Date.now();
+        const started = nowUnixMillis();
         this.logStart(cmd, opt);
         const r = spawnSync(cmd, opt.args, {
             encoding: 'utf8',
@@ -98,7 +99,7 @@ class Exec2 {
             logStart: opt.logStart ?? opt.log ?? false,
             logFinish: opt.logFinish ?? opt.log ?? false,
         };
-        const started = Date.now();
+        const started = nowUnixMillis();
         this.logStart(cmd, opt);
         try {
             const s = execSync(cmd, {
@@ -148,7 +149,7 @@ class Exec2 {
         const log = opt.log ?? true; // by default log should be true, as we are printing the output
         // Copy, to not mutate the input options
         opt = { ...opt, log, logStart: opt.logStart ?? log, logFinish: opt.logFinish ?? log };
-        const started = Date.now();
+        const started = nowUnixMillis();
         this.logStart(cmd, opt);
         await new Promise((resolve, reject) => {
             const p = spawn(cmd, opt.args || [], {
@@ -203,7 +204,7 @@ class Exec2 {
         const log = opt.log ?? printWhileRunning; // by default log should be true, as we are printing the output
         // Copy, to not mutate the input options
         opt = { ...opt, log, logStart: opt.logStart ?? log, logFinish: opt.logFinish ?? log };
-        const started = Date.now();
+        const started = nowUnixMillis();
         this.logStart(cmd, opt);
         let stdout = '';
         let stderr = '';

package/dist/fs/kpy.js

@@ -1,10 +1,10 @@
 import path from 'node:path';
-import { _since, localTime } from '@naturalcycles/js-lib/datetime';
+import { _since, nowUnixMillis } from '@naturalcycles/js-lib/datetime';
 import { glob, globSync } from 'tinyglobby';
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors.js';
 import { fs2 } from './fs2.js';
 export async function kpy(opt) {
-    const started = localTime.nowUnixMillis();
+    const started = nowUnixMillis();
     opt = kpyPrepare(opt);
     const filenames = await glob(opt.inputPatterns, {
         cwd: opt.baseDir,
@@ -33,7 +33,7 @@ export async function kpy(opt) {
     kpyLogResult(opt, filenames, started);
 }
 export function kpySync(opt) {
-    const started = localTime.nowUnixMillis();
+    const started = nowUnixMillis();
     opt = kpyPrepare(opt);
     const filenames = globSync(opt.inputPatterns, {
         cwd: opt.baseDir,

package/dist/jwt/jwt.service.js

@@ -78,6 +78,7 @@ export class JWTService {
             const { payload } = await jwtVerify(token, key, {
                 algorithms: this.cfg.verifyAlgorithms || [this.cfg.algorithm],
                 ...joseOpt,
+                // oxlint-disable-next-line no-restricted-globals -- jose expects a Date
                 currentDate: now === undefined ? undefined : new Date(now * 1000),
             });
             data = payload;

package/dist/stream/progressLogger.js

@@ -35,8 +35,8 @@ export class ProgressLogger {
     progress;
     peakRSS;
     start() {
-        this.started = Date.now();
-        this.lastSecondStarted = Date.now();
+        this.started = localTime.nowUnixMillis();
+        this.lastSecondStarted = localTime.nowUnixMillis();
         this.sma = new SimpleMovingAverage(10);
         this.processedLastSecond = 0;
         this.progress = 0;
@@ -60,7 +60,7 @@ export class ProgressLogger {
             return;
         const { metric, extra, chunkSize, heapUsed: logHeapUsed, heapTotal: logHeapTotal, rss: logRss, peakRSS: logPeakRss, rssMinusHeap, external, arrayBuffers, logRPS, logger, } = this.cfg;
         const mem = process.memoryUsage();
-        const now = Date.now();
+        const now = localTime.nowUnixMillis();
         const batchedProgress = this.progress * chunkSize;
         const lastRPS = (this.processedLastSecond * chunkSize) / ((now - this.lastSecondStarted) / 1000) || 0;
         const rpsTotal = Math.round(batchedProgress / ((now - this.started) / 1000)) || 0;

package/dist/stream/transform/transformMap.js

@@ -1,6 +1,6 @@
 import { Transform } from 'node:stream';
 import { _hc } from '@naturalcycles/js-lib';
-import { _since } from '@naturalcycles/js-lib/datetime';
+import { _since, nowUnixMillis } from '@naturalcycles/js-lib/datetime';
 import { _anyToError, _assert, ErrorMode } from '@naturalcycles/js-lib/error';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pDefer } from '@naturalcycles/js-lib/promise/pDefer.js';
@@ -43,7 +43,7 @@ export function transformMap(mapper, opt = {}) {
         async transform(chunk, _, cb) {
             // Initialize start time on first item
             if (started === 0) {
-                started = Date.now();
+                started = nowUnixMillis();
                 lastWarmupCheck = started;
             }
             if (isSettled)
@@ -150,7 +150,7 @@ export function transformMap(mapper, opt = {}) {
         },
     });
     function updateConcurrency() {
-        const now = Date.now();
+        const now = nowUnixMillis();
         if (now - lastWarmupCheck < WARMUP_CHECK_INTERVAL_MS)
             return;
         lastWarmupCheck = now;

package/dist/stream/transform/transformMapSync.js

@@ -1,4 +1,5 @@
 import { Transform } from 'node:stream';
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _anyToError, _assert, ErrorMode } from '@naturalcycles/js-lib/error';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { END, SKIP } from '@naturalcycles/js-lib/types';
@@ -11,7 +12,7 @@ import { PIPELINE_GRACEFUL_ABORT } from '../stream.util.js';
 export function transformMapSync(mapper, opt = {}) {
     const { predicate, // defaults to "no predicate" (pass everything)
     errorMode = ErrorMode.THROW_IMMEDIATELY, onError, onDone, metric = 'stream', objectMode = true, signal, } = opt;
-    const started = Date.now();
+    const started = nowUnixMillis();
     let index = -1;
     let countOut = 0;
     let isSettled = false;

package/dist/stream/transform/transformThrottle.js

@@ -48,7 +48,7 @@ export function transformThrottle(opt) {
             if (++count >= throughput) {
                 // console.log('pausing now after', {item, count})
                 lock = pDefer();
-                logger.log(`${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_since(start)}, will pause for ${_ms(interval * 1000 - (Date.now() - start))}`);
+                logger.log(`${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_since(start)}, will pause for ${_ms(interval * 1000 - (localTime.nowUnixMillis() - start))}`);
             }
             cb(null, item); // pass the item through
         },

package/dist/stream/transform/transformThrottleByRSS.js

@@ -39,7 +39,7 @@ export function transformThrottleByRSS(opt) {
             }
             if (!disabled && lastRSS > maxRSSBytes && !lock) {
                 lock = pDefer();
-                pausedSince = Date.now();
+                pausedSince = localTime.nowUnixMillis();
                 logger.log(`${localTime.now().toPretty()} transformThrottleByRSS paused: RSS ${_mb(lastRSS)} > ${maxRSS} MB`);
                 pollTimer = setTimeout(() => pollRSS(), pollInterval);
             }
@@ -67,7 +67,7 @@ export function transformThrottleByRSS(opt) {
             lock.resolve();
             lock = undefined;
         }
-        else if (pollTimeout && Date.now() - pausedSince >= pollTimeout) {
+        else if (pollTimeout && localTime.nowUnixMillis() - pausedSince >= pollTimeout) {
             clearTimeout(rssCheckTimer);
             if (onPollTimeout === 'throw') {
                 lock.reject(new Error(`transformThrottleByRSS pollTimeout of ${_ms(pollTimeout)} reached, RSS ${_mb(rss)} still > ${maxRSS} MB`));

package/dist/zip/zipInternal.js

@@ -8,6 +8,7 @@ integer read/write helpers, DOS date/time conversion (both directions) and
 entry-name normalization/validation.
 
  */
+// oxlint-disable no-restricted-globals -- DOS date/time fields are local-time components, converted via the native Date
 // oxlint-disable no-bitwise -- the ZIP format packs DOS date/time into bit fields
 // Compression methods.
 export const STORED = 0;

package/dist/zip/zipWriter.js

@@ -29,6 +29,7 @@ import { finished, pipeline } from 'node:stream/promises';
 import { promisify } from 'node:util';
 import zlib from 'node:zlib';
 import { comparators } from '@naturalcycles/js-lib/array/sort.js';
+import { nowUnix } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { glob } from 'tinyglobby';
 import { assertSafeZipEntryName, CDFH_SIG, CDFH_SIZE, DATA_DESCRIPTOR_SIG, DEFLATE, EOCDR_SIG, EOCDR_SIZE, LOCAL_FILE_HEADER_SIG, MAX_COMMENT_SIZE, normalizeZipEntryName, STORED, unixToDosDateTime, writeUInt64LE, ZIP64_EOCDL_SIG, ZIP64_EOCDL_SIZE, ZIP64_EOCDR_SIG, ZIP64_EOCDR_SIZE, } from './zipInternal.js';
@@ -222,7 +223,7 @@ export class ZipWriter {
         if (nameBuf.length > MAX_COMMENT_SIZE) {
             throw new Error(`zip entry name is too long: ${nameBuf.length} > ${MAX_COMMENT_SIZE} bytes`);
         }
-        const mtime = opt.mtime ?? Math.floor(Date.now() / 1000);
+        const mtime = opt.mtime ?? nowUnix();
         const { date, time } = unixToDosDateTime(mtime);
         const mode = opt.mode ?? (isDirectory ? DEFAULT_DIR_MODE : DEFAULT_FILE_MODE);
         if ((mode & 0xffff) !== mode) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/nodejs-lib",
   "type": "module",
-  "version": "15.139.0",
+  "version": "15.140.0",
   "dependencies": {
     "@naturalcycles/js-lib": "^15",
     "@standard-schema/spec": "^1",
@@ -14,7 +14,7 @@
     "yaml": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "20.70.0",
+    "@naturalcycles/dev-lib": "20.71.0",
     "typescript": "^7"
   },
   "exports": {

package/src/exec2/exec2.ts

@@ -1,5 +1,6 @@
 import { execSync, spawn, spawnSync } from 'node:child_process'
 import type { StdioOptions } from 'node:child_process'
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _since } from '@naturalcycles/js-lib/datetime/time.util.js'
 import { AppError } from '@naturalcycles/js-lib/error/error.util.js'
 import { _substringAfterLast } from '@naturalcycles/js-lib/string/string.util.js'
@@ -69,7 +70,7 @@ class Exec2 {
     const log = opt.log ?? true // by default log should be true, as we are printing the output
     // Copy, to not mutate the input options
     opt = { ...opt, log, logStart: opt.logStart ?? log, logFinish: opt.logFinish ?? log }
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
     this.logStart(cmd, opt)
 
     const r = spawnSync(cmd, opt.args, {
@@ -118,7 +119,7 @@ class Exec2 {
       logStart: opt.logStart ?? opt.log ?? false,
       logFinish: opt.logFinish ?? opt.log ?? false,
     }
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
     this.logStart(cmd, opt)
 
     try {
@@ -177,7 +178,7 @@ class Exec2 {
     const log = opt.log ?? true // by default log should be true, as we are printing the output
     // Copy, to not mutate the input options
     opt = { ...opt, log, logStart: opt.logStart ?? log, logFinish: opt.logFinish ?? log }
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
     this.logStart(cmd, opt)
 
     await new Promise<void>((resolve, reject) => {
@@ -245,7 +246,7 @@ class Exec2 {
     const log = opt.log ?? printWhileRunning // by default log should be true, as we are printing the output
     // Copy, to not mutate the input options
     opt = { ...opt, log, logStart: opt.logStart ?? log, logFinish: opt.logFinish ?? log }
-    const started = Date.now() as UnixTimestampMillis
+    const started = nowUnixMillis()
     this.logStart(cmd, opt)
     let stdout = ''
     let stderr = ''

package/src/fs/kpy.ts

@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { _since, localTime } from '@naturalcycles/js-lib/datetime'
+import { _since, nowUnixMillis } from '@naturalcycles/js-lib/datetime'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
 import { glob, globSync } from 'tinyglobby'
 import { boldWhite, dimGrey, grey, yellow } from '../colors/colors.js'
@@ -45,7 +45,7 @@ export interface KpyOptions {
 }
 
 export async function kpy(opt: KpyOptions): Promise<void> {
-  const started = localTime.nowUnixMillis()
+  const started = nowUnixMillis()
 
   opt = kpyPrepare(opt)
 
@@ -84,7 +84,7 @@ export async function kpy(opt: KpyOptions): Promise<void> {
 }
 
 export function kpySync(opt: KpyOptions): void {
-  const started = localTime.nowUnixMillis()
+  const started = nowUnixMillis()
 
   opt = kpyPrepare(opt)
 

package/src/jwt/jwt.service.ts

@@ -263,6 +263,7 @@ export class JWTService<T extends AnyObject = AnyObject> {
       const { payload } = await jwtVerify(token, key, {
         algorithms: this.cfg.verifyAlgorithms || [this.cfg.algorithm],
         ...joseOpt,
+        // oxlint-disable-next-line no-restricted-globals -- jose expects a Date
         currentDate: now === undefined ? undefined : new Date(now * 1000),
       })
       data = payload as TT

package/src/stream/progressLogger.ts

@@ -168,8 +168,8 @@ export class ProgressLogger<T> implements Disposable {
   private peakRSS!: number
 
   private start(): void {
-    this.started = Date.now() as UnixTimestampMillis
-    this.lastSecondStarted = Date.now() as UnixTimestampMillis
+    this.started = localTime.nowUnixMillis()
+    this.lastSecondStarted = localTime.nowUnixMillis()
     this.sma = new SimpleMovingAverage(10)
     this.processedLastSecond = 0
     this.progress = 0
@@ -213,7 +213,7 @@ export class ProgressLogger<T> implements Disposable {
 
     const mem = process.memoryUsage()
 
-    const now = Date.now() as UnixTimestampMillis
+    const now = localTime.nowUnixMillis()
     const batchedProgress = this.progress * chunkSize
     const lastRPS =
       (this.processedLastSecond * chunkSize) / ((now - this.lastSecondStarted) / 1000) || 0

package/src/stream/transform/transformMap.ts

@@ -1,7 +1,7 @@
 import { Transform } from 'node:stream'
 import { _hc } from '@naturalcycles/js-lib'
 import type { AbortableSignal } from '@naturalcycles/js-lib'
-import { _since } from '@naturalcycles/js-lib/datetime'
+import { _since, nowUnixMillis } from '@naturalcycles/js-lib/datetime'
 import { _anyToError, _assert, ErrorMode } from '@naturalcycles/js-lib/error'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
 import type { DeferredPromise } from '@naturalcycles/js-lib/promise'
@@ -141,7 +141,7 @@ export function transformMap<IN = any, OUT = IN>(
     async transform(this: Transform, chunk: IN, _, cb) {
       // Initialize start time on first item
       if (started === 0) {
-        started = Date.now() as UnixTimestampMillis
+        started = nowUnixMillis()
         lastWarmupCheck = started
       }
 
@@ -262,7 +262,7 @@ export function transformMap<IN = any, OUT = IN>(
   })
 
   function updateConcurrency(): void {
-    const now = Date.now()
+    const now = nowUnixMillis()
     if (now - lastWarmupCheck < WARMUP_CHECK_INTERVAL_MS) return
     lastWarmupCheck = now
 

package/src/stream/transform/transformMapSync.ts

@@ -1,8 +1,9 @@
 import { Transform } from 'node:stream'
 import type { AbortableSignal } from '@naturalcycles/js-lib'
+import { nowUnixMillis } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _anyToError, _assert, ErrorMode } from '@naturalcycles/js-lib/error'
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
-import type { IndexedMapper, Predicate, UnixTimestampMillis } from '@naturalcycles/js-lib/types'
+import type { IndexedMapper, Predicate } from '@naturalcycles/js-lib/types'
 import { END, SKIP } from '@naturalcycles/js-lib/types'
 import { yellow } from '../../colors/colors.js'
 import type { TransformOptions, TransformTyped } from '../stream.model.js'
@@ -78,7 +79,7 @@ export function transformMapSync<IN = any, OUT = IN>(
     signal,
   } = opt
 
-  const started = Date.now() as UnixTimestampMillis
+  const started = nowUnixMillis()
   let index = -1
   let countOut = 0
   let isSettled = false

package/src/stream/transform/transformThrottle.ts

@@ -73,7 +73,7 @@ export function transformThrottle<T>(opt: TransformThrottleOptions): TransformTy
         // console.log('pausing now after', {item, count})
         lock = pDefer()
         logger.log(
-          `${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_since(start)}, will pause for ${_ms(interval * 1000 - (Date.now() - start))}`,
+          `${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_since(start)}, will pause for ${_ms(interval * 1000 - (localTime.nowUnixMillis() - start))}`,
         )
       }
 

package/src/stream/transform/transformThrottleByRSS.ts

@@ -87,7 +87,7 @@ export function transformThrottleByRSS<T>(
 
       if (!disabled && lastRSS > maxRSSBytes && !lock) {
         lock = pDefer()
-        pausedSince = Date.now()
+        pausedSince = localTime.nowUnixMillis()
         logger.log(
           `${localTime.now().toPretty()} transformThrottleByRSS paused: RSS ${_mb(lastRSS)} > ${maxRSS} MB`,
         )
@@ -122,7 +122,7 @@ export function transformThrottleByRSS<T>(
       )
       lock!.resolve()
       lock = undefined
-    } else if (pollTimeout && Date.now() - pausedSince >= pollTimeout) {
+    } else if (pollTimeout && localTime.nowUnixMillis() - pausedSince >= pollTimeout) {
       clearTimeout(rssCheckTimer)
       if (onPollTimeout === 'throw') {
         lock!.reject(

package/src/stream/transform/worker/workerClassProxy.js

@@ -1,3 +1,4 @@
+// oxlint-disable-next-line no-restricted-globals -- the worker entry stays dependency-free
 const started = Date.now()
 import { inspect } from 'node:util'
 import { workerData, parentPort } from 'node:worker_threads'
@@ -20,6 +21,7 @@ try {
 const { WorkerClass } = await import(workerFile)
 const worker = new WorkerClass(workerData)
 
+// oxlint-disable-next-line no-restricted-globals -- the worker entry stays dependency-free
 log(`${metric}#${workerIndex} loaded in ${Date.now() - started} ms`)
 
 let errors = 0

package/src/zip/zipInternal.ts

@@ -11,6 +11,8 @@ entry-name normalization/validation.
 
 import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
 
+// oxlint-disable no-restricted-globals -- DOS date/time fields are local-time components, converted via the native Date
+
 // oxlint-disable no-bitwise -- the ZIP format packs DOS date/time into bit fields
 
 // Compression methods.

package/src/zip/zipWriter.ts

@@ -31,6 +31,7 @@ import { finished, pipeline } from 'node:stream/promises'
 import { promisify } from 'node:util'
 import zlib from 'node:zlib'
 import { comparators } from '@naturalcycles/js-lib/array/sort.js'
+import { nowUnix } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
 import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
 import { glob } from 'tinyglobby'
@@ -297,7 +298,7 @@ export class ZipWriter implements AsyncDisposable {
     if (nameBuf.length > MAX_COMMENT_SIZE) {
       throw new Error(`zip entry name is too long: ${nameBuf.length} > ${MAX_COMMENT_SIZE} bytes`)
     }
-    const mtime = opt.mtime ?? (Math.floor(Date.now() / 1000) as UnixTimestamp)
+    const mtime = opt.mtime ?? nowUnix()
     const { date, time } = unixToDosDateTime(mtime)
     const mode = opt.mode ?? (isDirectory ? DEFAULT_DIR_MODE : DEFAULT_FILE_MODE)
     if ((mode & 0xffff) !== mode) {