@naturalcycles/nodejs-lib 12.86.0 → 12.87.0

package/dist/security/secret.util.d.ts

@@ -24,8 +24,8 @@ export declare function loadSecretsFromEncryptedJsonFile(filePath: string, secre
  * For whole-file encryption - use `loadSecretsFromEncryptedJsonFile`
  */
 export declare function loadSecretsFromEncryptedJsonFileValues(filePath: string, secretEncryptionKey?: Base64String): void;
-export declare function secret<T = string>(k: string): T;
-export declare function secretOptional<T = string>(k: string): T | undefined;
+export declare function secret<T = string>(k: string, parseJson?: boolean): T;
+export declare function secretOptional<T = string>(k: string, parseJson?: boolean): T | undefined;
 export declare function getSecretMap(): StringMap;
 /**
  * REPLACES secretMap with new map.

package/dist/security/secret.util.js

@@ -78,17 +78,23 @@ function loadSecretsFromEncryptedJsonFileValues(filePath, secretEncryptionKey) {
         .join(', ')}`);
 }
 exports.loadSecretsFromEncryptedJsonFileValues = loadSecretsFromEncryptedJsonFileValues;
-function secret(k) {
-    const v = secretOptional(k);
+function secret(k, parseJson = false) {
+    const v = secretOptional(k, parseJson);
     if (!v) {
         throw new Error(`secret(${k.toUpperCase()}) not found!`);
     }
     return v;
 }
 exports.secret = secret;
-function secretOptional(k) {
+function secretOptional(k, parseJson = false) {
     requireLoaded();
-    return secretMap[k.toUpperCase()];
+    let v = secretMap[k.toUpperCase()];
+    if (!v)
+        return;
+    if (parseJson) {
+        v = (0, js_lib_1._jsonParseIfPossible)(v);
+    }
+    return v;
 }
 exports.secretOptional = secretOptional;
 function getSecretMap() {

package/dist/stream/pipeline/pipeline.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbortableTransform = exports._pipelineToArray = exports._pipeline = void 0;
 const node_stream_1 = require("node:stream");
+const promises_1 = require("node:stream/promises");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../../index");
 /**
@@ -52,19 +53,17 @@ async function _pipeline(streams, opt = {}) {
             }
         });
     }
-    return new Promise((resolve, reject) => {
-        (0, node_stream_1.pipeline)(first, ...rest, (err) => {
-            if (err) {
-                if (opt.allowClose && err?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-                    console.log('_pipeline closed (as expected)');
-                    return resolve();
-                }
-                // console.log(`_pipeline error`, err)
-                return reject(err);
-            }
-            resolve();
-        });
-    });
+    try {
+        return await (0, promises_1.pipeline)(first, ...rest);
+    }
+    catch (err) {
+        if (opt.allowClose && err?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
+            console.log('_pipeline closed (as expected)');
+            return;
+        }
+        // console.log(`_pipeline error`, err)
+        throw err;
+    }
 }
 exports._pipeline = _pipeline;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.86.0",
+  "version": "12.87.0",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -78,7 +78,7 @@
     "url": "https://github.com/NaturalCycles/nodejs-lib"
   },
   "engines": {
-    "node": ">=16.10.0"
+    "node": ">=18.12.0"
   },
   "description": "Standard library for Node.js",
   "author": "Natural Cycles Team",

package/src/security/secret.util.ts

@@ -1,5 +1,5 @@
 import * as fs from 'node:fs'
-import { _assert, Base64String, StringMap } from '@naturalcycles/js-lib'
+import { _assert, _jsonParseIfPossible, Base64String, StringMap } from '@naturalcycles/js-lib'
 import { decryptObject, decryptRandomIVBuffer } from './crypto.util'
 
 let loaded = false
@@ -107,8 +107,8 @@ export function loadSecretsFromEncryptedJsonFileValues(
   )
 }
 
-export function secret<T = string>(k: string): T {
-  const v = secretOptional(k)
+export function secret<T = string>(k: string, parseJson = false): T {
+  const v = secretOptional(k, parseJson)
   if (!v) {
     throw new Error(`secret(${k.toUpperCase()}) not found!`)
   }
@@ -116,9 +116,16 @@ export function secret<T = string>(k: string): T {
   return v as any
 }
 
-export function secretOptional<T = string>(k: string): T | undefined {
+export function secretOptional<T = string>(k: string, parseJson = false): T | undefined {
   requireLoaded()
-  return secretMap[k.toUpperCase()] as T | undefined
+  let v = secretMap[k.toUpperCase()]
+  if (!v) return
+
+  if (parseJson) {
+    v = _jsonParseIfPossible(v)
+  }
+
+  return v as T
 }
 
 export function getSecretMap(): StringMap {

package/src/stream/pipeline/pipeline.ts

@@ -1,4 +1,5 @@
-import { pipeline, Readable, Transform, Writable } from 'node:stream'
+import { Readable, Transform, Writable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
 import { _last, AnyFunction, DeferredPromise, pDefer } from '@naturalcycles/js-lib'
 import { writablePushToArray } from '../../index'
 
@@ -74,20 +75,16 @@ export async function _pipeline(streams: AnyStream[], opt: PipelineOptions = {})
     })
   }
 
-  return new Promise<void>((resolve, reject) => {
-    pipeline(first, ...(rest as any[]), (err: Error) => {
-      if (err) {
-        if (opt.allowClose && (err as any)?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-          console.log('_pipeline closed (as expected)')
-          return resolve()
-        }
-        // console.log(`_pipeline error`, err)
-        return reject(err)
-      }
-
-      resolve()
-    })
-  })
+  try {
+    return await pipeline(first, ...(rest as any[]))
+  } catch (err) {
+    if (opt.allowClose && (err as any)?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
+      console.log('_pipeline closed (as expected)')
+      return
+    }
+    // console.log(`_pipeline error`, err)
+    throw err
+  }
 }
 
 /**