@naturalcycles/nodejs-lib 13.34.5 → 13.35.0

package/dist/stream/transform/transformThrottle.js

@@ -49,7 +49,7 @@ function transformThrottle(opt) {
                 // console.log('pausing now after', {item, count})
                 paused = (0, js_lib_1.pDefer)();
                 if (debug) {
-                    console.log(`${js_lib_1.localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${(0, js_lib_1._ms)(interval * 1000)}, will pause for ${(0, js_lib_1._ms)(interval * 1000 - (Date.now() - start))}`);
+                    console.log(`${js_lib_1.localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${(0, js_lib_1._since)(start)}, will pause for ${(0, js_lib_1._ms)(interval * 1000 - (Date.now() - start))}`);
                 }
             }
             cb(null, item); // pass the item through
@@ -60,15 +60,20 @@ function transformThrottle(opt) {
         },
     });
     function onInterval(transform) {
-        if (!paused)
-            return;
-        if (debug) {
-            console.log(`${js_lib_1.localTime.now().toPretty()} transformThrottle resumed`);
+        if (paused) {
+            if (debug) {
+                console.log(`${js_lib_1.localTime.now().toPretty()} transformThrottle resumed`);
+            }
+            paused.resolve();
+            paused = undefined;
+        }
+        else {
+            if (debug) {
+                console.log(`${js_lib_1.localTime.now().toPretty()} transformThrottle passed ${count} (of max ${throughput}) items in ${(0, js_lib_1._since)(start)}`);
+            }
         }
         count = 0;
         start = Date.now();
         timeout = setTimeout(() => onInterval(transform), interval * 1000);
-        paused.resolve();
-        paused = undefined;
     }
 }

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -14,6 +14,8 @@ export declare const dateStringSchema: StringSchema<string>;
 export declare const binarySchema: import("joi").BinarySchema<Buffer>;
 export declare const dateObjectSchema: ObjectSchema<any>;
 export declare const dateIntervalStringSchema: StringSchema<string>;
+export declare const DATE_TIME_STRING_REGEX: RegExp;
+export declare const dateTimeStringSchema: StringSchema<string>;
 /**
  * Allows all values of a String Enum.
  */

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uuidSchema = exports.macAddressSchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.ianaTimezoneSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.urlSchema = exports.numberEnumKeySchema = exports.numberEnumValueSchema = exports.stringEnumKeySchema = exports.stringEnumValueSchema = exports.dateIntervalStringSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchemaTyped = exports.numberSchema = exports.stringSchemaTyped = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
+exports.uuidSchema = exports.macAddressSchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.ianaTimezoneSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.urlSchema = exports.numberEnumKeySchema = exports.numberEnumValueSchema = exports.stringEnumKeySchema = exports.stringEnumValueSchema = exports.dateTimeStringSchema = exports.DATE_TIME_STRING_REGEX = exports.dateIntervalStringSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchemaTyped = exports.numberSchema = exports.stringSchemaTyped = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
 exports.arraySchema = arraySchema;
 exports.objectSchema = objectSchema;
 exports.oneOfSchema = oneOfSchema;
@@ -23,6 +23,10 @@ const DATE_INTERVAL_REGEX = /^\d{4}-\d{2}-\d{2}\/\d{4}-\d{2}-\d{2}$/;
 exports.dateIntervalStringSchema = exports.stringSchema.regex(DATE_INTERVAL_REGEX).messages({
     'string.pattern.base': `must be a DateInterval string`,
 });
+exports.DATE_TIME_STRING_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?(?:Z|[+-]\d{2}:\d{2})?)?$/;
+exports.dateTimeStringSchema = exports.stringSchema.regex(exports.DATE_TIME_STRING_REGEX).messages({
+    'string.pattern.base': `must be a DateTime string`,
+});
 /**
  * Allows all values of a String Enum.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.34.5",
+  "version": "13.35.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/stream/transform/transformThrottle.ts

@@ -1,6 +1,7 @@
 import { Transform } from 'node:stream'
 import {
   _ms,
+  _since,
   DeferredPromise,
   localTime,
   NumberOfMilliseconds,
@@ -75,7 +76,7 @@ export function transformThrottle<T>(opt: TransformThrottleOptions): TransformTy
         paused = pDefer()
         if (debug) {
           console.log(
-            `${localTime.now().toPretty()} transformThrottle activated: ${count} items passed in ${_ms(interval * 1000)}, 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 - (Date.now() - start))}`,
           )
         }
       }
@@ -89,16 +90,23 @@ export function transformThrottle<T>(opt: TransformThrottleOptions): TransformTy
   })
 
   function onInterval(transform: Transform): void {
-    if (!paused) return
+    if (paused) {
+      if (debug) {
+        console.log(`${localTime.now().toPretty()} transformThrottle resumed`)
+      }
 
-    if (debug) {
-      console.log(`${localTime.now().toPretty()} transformThrottle resumed`)
+      paused.resolve()
+      paused = undefined
+    } else {
+      if (debug) {
+        console.log(
+          `${localTime.now().toPretty()} transformThrottle passed ${count} (of max ${throughput}) items in ${_since(start)}`,
+        )
+      }
     }
 
     count = 0
     start = Date.now()
     timeout = setTimeout(() => onInterval(transform), interval * 1000)
-    paused.resolve()
-    paused = undefined
   }
 }

package/src/validation/joi/joi.shared.schemas.ts

@@ -29,6 +29,13 @@ export const dateIntervalStringSchema = stringSchema.regex(DATE_INTERVAL_REGEX).
   'string.pattern.base': `must be a DateInterval string`,
 })
 
+export const DATE_TIME_STRING_REGEX =
+  /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?(?:Z|[+-]\d{2}:\d{2})?)?$/
+
+export const dateTimeStringSchema = stringSchema.regex(DATE_TIME_STRING_REGEX).messages({
+  'string.pattern.base': `must be a DateTime string`,
+})
+
 /**
  * Allows all values of a String Enum.
  */