@naturalcycles/nodejs-lib 12.85.4 → 12.86.1

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

@@ -24,11 +24,8 @@ export declare function loadSecretsFromEncryptedJsonFile(filePath: string, secre
  * For whole-file encryption - use `loadSecretsFromEncryptedJsonFile`
  */
 export declare function loadSecretsFromEncryptedJsonFileValues(filePath: string, secretEncryptionKey?: Base64String): void;
-/**
- * json secrets are always base64'd
- */
-export declare function secret<T = string>(k: string, json?: boolean): T;
-export declare function secretOptional<T = string>(k: string, json?: boolean): 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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setSecretMap = exports.getSecretMap = exports.secretOptional = exports.secret = exports.loadSecretsFromEncryptedJsonFileValues = exports.loadSecretsFromEncryptedJsonFile = exports.removeSecretsFromEnv = exports.loadSecretsFromEnv = void 0;
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const __1 = require("..");
 const crypto_util_1 = require("./crypto.util");
 let loaded = false;
 const secretMap = {};
@@ -44,7 +43,6 @@ exports.removeSecretsFromEnv = removeSecretsFromEnv;
  * Whole file is encrypted.
  * For "json-values encrypted" style - use `loadSecretsFromEncryptedJsonFileValues`
  */
-// eslint-disable-next-line @typescript-eslint/naming-convention
 function loadSecretsFromEncryptedJsonFile(filePath, secretEncryptionKey) {
     (0, js_lib_1._assert)(fs.existsSync(filePath), `loadSecretsFromEncryptedJsonFile() cannot load from path: ${filePath}`);
     let secrets;
@@ -80,21 +78,23 @@ function loadSecretsFromEncryptedJsonFileValues(filePath, secretEncryptionKey) {
         .join(', ')}`);
 }
 exports.loadSecretsFromEncryptedJsonFileValues = loadSecretsFromEncryptedJsonFileValues;
-/**
- * json secrets are always base64'd
- */
-function secret(k, json = false) {
-    const v = secretOptional(k, json);
+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, json = false) {
+function secretOptional(k, parseJson = false) {
     requireLoaded();
-    const v = secretMap[k.toUpperCase()];
-    return v && json ? JSON.parse((0, __1.base64ToString)(v)) : v;
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.85.4",
+  "version": "12.86.1",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/security/secret.util.ts

@@ -1,6 +1,5 @@
 import * as fs from 'node:fs'
-import { _assert, Base64String, StringMap } from '@naturalcycles/js-lib'
-import { base64ToString } from '..'
+import { _assert, _jsonParseIfPossible, Base64String, StringMap } from '@naturalcycles/js-lib'
 import { decryptObject, decryptRandomIVBuffer } from './crypto.util'
 
 let loaded = false
@@ -50,7 +49,6 @@ export function removeSecretsFromEnv(): void {
  * Whole file is encrypted.
  * For "json-values encrypted" style - use `loadSecretsFromEncryptedJsonFileValues`
  */
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export function loadSecretsFromEncryptedJsonFile(
   filePath: string,
   secretEncryptionKey?: Base64String,
@@ -109,11 +107,8 @@ export function loadSecretsFromEncryptedJsonFileValues(
   )
 }
 
-/**
- * json secrets are always base64'd
- */
-export function secret<T = string>(k: string, json = false): T {
-  const v = secretOptional(k, json)
+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!`)
   }
@@ -121,10 +116,16 @@ export function secret<T = string>(k: string, json = false): T {
   return v as any
 }
 
-export function secretOptional<T = string>(k: string, json = false): T | undefined {
+export function secretOptional<T = string>(k: string, parseJson = false): T | undefined {
   requireLoaded()
-  const v = secretMap[k.toUpperCase()]
-  return v && json ? JSON.parse(base64ToString(v)) : v
+  let v = secretMap[k.toUpperCase()]
+  if (!v) return
+
+  if (parseJson) {
+    v = _jsonParseIfPossible(v)
+  }
+
+  return v as T
 }
 
 export function getSecretMap(): StringMap {