@naturalcycles/nodejs-lib 13.23.1 → 13.24.1

package/dist/csv/csvReader.js

@@ -34,7 +34,7 @@ function csvStringParse(str, cfg = {}) {
 }
 exports.csvStringParse = csvStringParse;
 function csvStringToArray(str) {
-    const objPattern = new RegExp('(,|\\r?\\n|\\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\\r\\n]*))', 'gi');
+    const objPattern = new RegExp(String.raw `(,|\r?\n|\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\r\n]*))`, 'gi');
     let matches;
     const arr = [[]];
     while ((matches = objPattern.exec(str))) {

package/dist/slack/slack.service.js

@@ -130,7 +130,7 @@ class SlackService {
 }
 exports.SlackService = SlackService;
 function slackDefaultMessagePrefixHook(msg) {
-    const tokens = [(0, js_lib_1.localTimeNow)().toPretty()];
+    const tokens = [js_lib_1.localTime.now().toPretty()];
     const { ctx } = msg;
     // AppEngine-specific decoration
     if (GAE && ctx && typeof ctx === 'object' && typeof ctx.header === 'function') {

package/dist/stream/progressLogger.js

@@ -103,7 +103,7 @@ class ProgressLogger {
             if (perHour > 900) {
                 perHour = Math.round(perHour / 1000) + 'K';
             }
-            logger.log(`${(0, colors_1.dimGrey)((0, js_lib_1.localTimeNow)().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(this.started))} so far to process ${(0, colors_1.yellow)(batchedProgress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
+            logger.log(`${(0, colors_1.dimGrey)(js_lib_1.localTime.now().toPretty())} ${(0, colors_1.white)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(this.started))} so far to process ${(0, colors_1.yellow)(batchedProgress)} rows, ~${(0, colors_1.yellow)(perHour)}/hour`);
         }
         else if (final) {
             logger.log(`${(0, colors_1.boldWhite)(metric)} took ${(0, colors_1.yellow)((0, js_lib_1._since)(this.started))} to process ${(0, colors_1.yellow)(batchedProgress)} rows with total RPS of ${(0, colors_1.yellow)(rpsTotal)}`);

package/dist/util/buildInfo.util.js

@@ -5,7 +5,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const fs2_1 = require("../fs/fs2");
 const git_util_1 = require("./git.util");
 function generateBuildInfo(opt = {}) {
-    const now = (0, js_lib_1.localTimeOrNow)(opt.overrideTimestamp);
+    const now = js_lib_1.localTime.orNow(opt.overrideTimestamp);
     const ts = now.unix();
     const rev = (0, git_util_1.gitCurrentCommitSha)();
     const branchName = (0, git_util_1.gitCurrentBranchName)();

package/dist/validation/joi/string.extensions.js

@@ -41,14 +41,14 @@ function stringExtensions(joi) {
                     let { min, max } = args;
                     // Today allows +-14 hours gap to account for different timezones
                     if (max === 'today') {
-                        max = (0, js_lib_1.localTimeNow)().plus(14, 'hour').toISODate();
+                        max = getTodayStrPlus15();
                     }
                     if (min === 'today') {
-                        min = (0, js_lib_1.localTimeNow)().minus(14, 'hour').toISODate();
+                        min = getTodayStrMinus15();
                     }
                     // console.log('min/max', min, max)
-                    const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v);
-                    if (!m || m.length <= 1) {
+                    const parts = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v);
+                    if (!parts || parts.length < 4) {
                         err = 'string.dateString';
                     }
                     else if (min && v < min) {
@@ -57,8 +57,7 @@ function stringExtensions(joi) {
                     else if (max && v > max) {
                         err = 'string.dateStringMax';
                     }
-                    else if (!js_lib_1.LocalDate.isValid(v)) {
-                        // todo: replace with another regex (from ajv-validators) for speed
+                    else if (!isValidDate(parts)) {
                         err = 'string.dateStringCalendarAccuracy';
                     }
                     if (err) {
@@ -71,3 +70,39 @@ function stringExtensions(joi) {
     };
 }
 exports.stringExtensions = stringExtensions;
+const DAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+// Based on: https://github.com/ajv-validator
+function isValidDate(parts) {
+    const year = Number(parts[1]);
+    const month = Number(parts[2]);
+    const day = Number(parts[3]);
+    return (month >= 1 &&
+        month <= 12 &&
+        day >= 1 &&
+        day <= (month === 2 && isLeapYear(year) ? 29 : DAYS[month]));
+}
+function isLeapYear(year) {
+    return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
+}
+let lastCheckedPlus = 0;
+let todayStrPlusCached;
+let lastCheckedMinus = 0;
+let todayStrMinusCached;
+function getTodayStrPlus15() {
+    const now = Date.now();
+    if (now - lastCheckedPlus < 3_600_000) {
+        // cached for 1 hour
+        return todayStrPlusCached;
+    }
+    lastCheckedPlus = now;
+    return (todayStrPlusCached = js_lib_1.localTime.now().plus(15, 'hour').toISODate());
+}
+function getTodayStrMinus15() {
+    const now = Date.now();
+    if (now - lastCheckedMinus < 3_600_000) {
+        // cached for 1 hour
+        return todayStrMinusCached;
+    }
+    lastCheckedMinus = now;
+    return (todayStrMinusCached = js_lib_1.localTime.now().plus(-15, 'hour').toISODate());
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.23.1",
+  "version": "13.24.1",
   "scripts": {
     "prepare": "husky",
     "docs-serve": "vuepress dev docs",
@@ -34,7 +34,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@naturalcycles/bench-lib": "^2.0.0",
+    "@naturalcycles/bench-lib": "^3.0.0",
     "@naturalcycles/dev-lib": "^13.0.0",
     "@types/node": "^20.1.0",
     "@types/yargs": "^16.0.0",

package/src/csv/csvReader.ts

@@ -56,7 +56,10 @@ export function csvStringParse<T extends AnyObject = any>(
 }
 
 export function csvStringToArray(str: string): string[][] {
-  const objPattern = new RegExp('(,|\\r?\\n|\\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\\r\\n]*))', 'gi')
+  const objPattern = new RegExp(
+    String.raw`(,|\r?\n|\r|^)(?:"([^"]*(?:""[^"]*)*)"|([^,\r\n]*))`,
+    'gi',
+  )
   let matches: RegExpExecArray | null
   const arr: any[][] = [[]]
 

package/src/slack/slack.service.ts

@@ -6,7 +6,7 @@ import {
   CommonLogLevel,
   Fetcher,
   getFetcher,
-  localTimeNow,
+  localTime,
   PQueue,
 } from '@naturalcycles/js-lib'
 import { _inspect, InspectAnyOptions } from '..'
@@ -180,7 +180,7 @@ export class SlackService<CTX = any> {
 }
 
 export function slackDefaultMessagePrefixHook(msg: SlackMessage): string[] {
-  const tokens = [localTimeNow().toPretty()]
+  const tokens = [localTime.now().toPretty()]
   const { ctx } = msg
 
   // AppEngine-specific decoration

package/src/stream/progressLogger.ts

@@ -4,7 +4,7 @@ import {
   _since,
   AnyObject,
   CommonLogger,
-  localTimeNow,
+  localTime,
   SimpleMovingAverage,
   UnixTimestampMillisNumber,
 } from '@naturalcycles/js-lib'
@@ -294,7 +294,7 @@ export class ProgressLogger<T> implements Disposable {
       }
 
       logger.log(
-        `${dimGrey(localTimeNow().toPretty())} ${white(metric)} took ${yellow(
+        `${dimGrey(localTime.now().toPretty())} ${white(metric)} took ${yellow(
           _since(this.started),
         )} so far to process ${yellow(batchedProgress)} rows, ~${yellow(perHour)}/hour`,
       )

package/src/util/buildInfo.util.ts

@@ -2,7 +2,7 @@ import {
   _filterUndefinedValues,
   AnyObject,
   BuildInfo,
-  localTimeOrNow,
+  localTime,
   UnixTimestampNumber,
 } from '@naturalcycles/js-lib'
 import { fs2 } from '../fs/fs2'
@@ -21,7 +21,7 @@ export interface GenerateBuildInfoOptions {
 }
 
 export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo {
-  const now = localTimeOrNow(opt.overrideTimestamp)
+  const now = localTime.orNow(opt.overrideTimestamp)
   const ts = now.unix()
 
   const rev = gitCurrentCommitSha()

package/src/validation/joi/string.extensions.ts

@@ -1,4 +1,4 @@
-import { LocalDate, localTimeNow } from '@naturalcycles/js-lib'
+import { localTime } from '@naturalcycles/js-lib'
 import Joi, { Extension, StringSchema as JoiStringSchema } from 'joi'
 
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
@@ -51,22 +51,21 @@ export function stringExtensions(joi: typeof Joi): Extension {
 
           // Today allows +-14 hours gap to account for different timezones
           if (max === 'today') {
-            max = localTimeNow().plus(14, 'hour').toISODate()
+            max = getTodayStrPlus15()
           }
           if (min === 'today') {
-            min = localTimeNow().minus(14, 'hour').toISODate()
+            min = getTodayStrMinus15()
           }
           // console.log('min/max', min, max)
 
-          const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v)
-          if (!m || m.length <= 1) {
+          const parts = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v)
+          if (!parts || parts.length < 4) {
             err = 'string.dateString'
           } else if (min && v < min) {
             err = 'string.dateStringMin'
           } else if (max && v > max) {
             err = 'string.dateStringMax'
-          } else if (!LocalDate.isValid(v)) {
-            // todo: replace with another regex (from ajv-validators) for speed
+          } else if (!isValidDate(parts)) {
             err = 'string.dateStringCalendarAccuracy'
           }
 
@@ -80,3 +79,48 @@ export function stringExtensions(joi: typeof Joi): Extension {
     },
   }
 }
+
+const DAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+// Based on: https://github.com/ajv-validator
+function isValidDate(parts: string[]): boolean {
+  const year = Number(parts[1])
+  const month = Number(parts[2])
+  const day = Number(parts[3])
+  return (
+    month >= 1 &&
+    month <= 12 &&
+    day >= 1 &&
+    day <= (month === 2 && isLeapYear(year) ? 29 : DAYS[month]!)
+  )
+}
+
+function isLeapYear(year: number): boolean {
+  return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0)
+}
+
+let lastCheckedPlus = 0
+let todayStrPlusCached: string
+let lastCheckedMinus = 0
+let todayStrMinusCached: string
+
+function getTodayStrPlus15(): string {
+  const now = Date.now()
+  if (now - lastCheckedPlus < 3_600_000) {
+    // cached for 1 hour
+    return todayStrPlusCached
+  }
+
+  lastCheckedPlus = now
+  return (todayStrPlusCached = localTime.now().plus(15, 'hour').toISODate())
+}
+
+function getTodayStrMinus15(): string {
+  const now = Date.now()
+  if (now - lastCheckedMinus < 3_600_000) {
+    // cached for 1 hour
+    return todayStrMinusCached
+  }
+
+  lastCheckedMinus = now
+  return (todayStrMinusCached = localTime.now().plus(-15, 'hour').toISODate())
+}