@naturalcycles/nodejs-lib 12.65.1 → 12.66.0

package/dist/bin/secrets-decrypt.js

@@ -6,12 +6,12 @@ const colors_1 = require("../colors");
 const script_1 = require("../script");
 const secrets_decrypt_util_1 = require("../secret/secrets-decrypt.util");
 (0, script_1.runScript)(() => {
-    const { dir, encKey, algorithm, del } = getDecryptCLIOptions();
-    (0, secrets_decrypt_util_1.secretsDecrypt)(dir, encKey, algorithm, del);
+    const { dir, encKey, del } = getDecryptCLIOptions();
+    (0, secrets_decrypt_util_1.secretsDecrypt)(dir, encKey, del);
 });
 function getDecryptCLIOptions() {
     require('dotenv').config();
-    let { dir, encKey, encKeyVar, algorithm, del } = yargs.options({
+    let { dir, encKey, encKeyVar, del } = yargs.options({
         dir: {
             type: 'array',
             desc: 'Directory with secrets. Can be many',
@@ -29,10 +29,10 @@ function getDecryptCLIOptions() {
             desc: 'Env variable name to get `encKey` from.',
             default: 'SECRET_ENCRYPTION_KEY',
         },
-        algorithm: {
-            type: 'string',
-            default: 'aes-256-cbc',
-        },
+        // algorithm: {
+        //   type: 'string',
+        //   default: 'aes-256-cbc',
+        // },
         del: {
             type: 'boolean',
             desc: 'Delete source files after encryption/decryption. Be careful!',
@@ -48,5 +48,5 @@ function getDecryptCLIOptions() {
         }
     }
     // `as any` because @types/yargs can't handle string[] type properly
-    return { dir: dir, encKey, algorithm, del };
+    return { dir: dir, encKey, del };
 }

package/dist/bin/secrets-encrypt.js

@@ -6,12 +6,12 @@ const colors_1 = require("../colors");
 const script_1 = require("../script");
 const secrets_encrypt_util_1 = require("../secret/secrets-encrypt.util");
 (0, script_1.runScript)(() => {
-    const { pattern, encKey, algorithm, del } = getEncryptCLIOptions();
-    (0, secrets_encrypt_util_1.secretsEncrypt)(pattern, encKey, algorithm, del);
+    const { pattern, encKey, del } = getEncryptCLIOptions();
+    (0, secrets_encrypt_util_1.secretsEncrypt)(pattern, encKey, del);
 });
 function getEncryptCLIOptions() {
     require('dotenv').config();
-    let { pattern, encKey, encKeyVar, algorithm, del } = yargs.options({
+    let { pattern, encKey, encKeyVar, del } = yargs.options({
         pattern: {
             type: 'string',
             array: true,
@@ -30,10 +30,10 @@ function getEncryptCLIOptions() {
             desc: 'Env variable name to get `encKey` from.',
             default: 'SECRET_ENCRYPTION_KEY',
         },
-        algorithm: {
-            type: 'string',
-            default: 'aes-256-cbc',
-        },
+        // algorithm: {
+        //   type: 'string',
+        //   default: 'aes-256-cbc',
+        // },
         del: {
             type: 'boolean',
             desc: 'Delete source files after encryption/decryption. Be careful!',
@@ -49,5 +49,5 @@ function getEncryptCLIOptions() {
         }
     }
     // `as any` because @types/yargs can't handle string[] type properly
-    return { pattern: pattern, encKey, algorithm, del };
+    return { pattern: pattern, encKey, del };
 }

package/dist/got/getGot.js

@@ -180,7 +180,7 @@ function gotBeforeRetryHook(opt) {
         const statusCode = err?.response?.statusCode || 0;
         if (statusCode && statusCode < 300) {
             // todo: possibly remove the log message completely in the future
-            opt.logger.log(`skipping got.beforeRetry hook at statusCode is ${statusCode}`);
+            opt.logger.log(`skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`);
             return;
         }
         const { method, url, prefixUrl } = options;

package/dist/index.d.ts

@@ -54,7 +54,7 @@ export * from './stream/writable/writablePushToArray';
 export * from './stream/writable/writableVoid';
 import { inspectAny, InspectAnyOptions, inspectAnyStringifyFn } from './string/inspectAny';
 export * from './util/env.util';
-import { LRUMemoCache } from './util/lruMemoCache';
+export * from './util/lruMemoCache';
 export * from './util/zip.util';
 import { readAjvSchemas, readJsonSchemas } from './validation/ajv/ajv.util';
 import { AjvSchema, AjvSchemaCfg, AjvValidationOptions } from './validation/ajv/ajvSchema';
@@ -67,4 +67,4 @@ import { JoiValidationError, JoiValidationErrorData } from './validation/joi/joi
 import { convert, getValidationResult, isValid, JoiValidationResult, undefinedIfInvalid, validate } from './validation/joi/joi.validation.util';
 import { runScript, RunScriptOptions } from './script';
 export type { RunScriptOptions, JoiValidationErrorData, JoiValidationResult, ValidationErrorItem, ExtendedJoi, SchemaTyped, AnySchema, AnySchemaTyped, ArraySchemaTyped, BooleanSchemaTyped, NumberSchemaTyped, ObjectSchemaTyped, StringSchemaTyped, IDebug, IDebugger, SlackServiceCfg, SlackMessage, SlackMessageProps, SlackApiBody, SlackMessagePrefixHook, ReadableTyped, WritableTyped, TransformTyped, PipelineFromNDJsonFileOptions, PipelineToNDJsonFileOptions, TransformJsonParseOptions, TransformToNDJsonOptions, TransformMapOptions, TransformMapSyncOptions, NDJSONStreamForEachOptions, TransformOptions, TransformMultiThreadedOptions, WorkerClassInterface, WorkerInput, WorkerOutput, TableDiffOptions, InspectAnyOptions, Got, GetGotOptions, AfterResponseHook, BeforeErrorHook, BeforeRequestHook, AjvValidationOptions, AjvSchemaCfg, AjvValidationErrorData, };
-export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, LRUMemoCache, Debug, SlackService, slackDefaultMessagePrefixHook, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformMap, transformMapSync, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, inspectAnyStringifyFn, RequestError, TimeoutError, _chunkBuffer, Ajv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, runScript, };
+export { JoiValidationError, validate, getValidationResult, isValid, undefinedIfInvalid, convert, Joi, Debug, SlackService, slackDefaultMessagePrefixHook, ndjsonStreamForEach, pipelineFromNDJsonFile, pipelineToNDJsonFile, NDJsonStats, streamToNDJsonFile, transformJsonParse, bufferReviver, transformToNDJson, transformMap, transformMapSync, transformMultiThreaded, BaseWorkerClass, tableDiff, inspectAny, inspectAnyStringifyFn, RequestError, TimeoutError, _chunkBuffer, Ajv, AjvSchema, AjvValidationError, readJsonSchemas, readAjvSchemas, runScript, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runScript = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.RequestError = exports.inspectAnyStringifyFn = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.transformMapSync = exports.transformMap = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.Debug = exports.LRUMemoCache = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = void 0;
+exports.runScript = exports.readAjvSchemas = exports.readJsonSchemas = exports.AjvValidationError = exports.AjvSchema = exports.Ajv = exports._chunkBuffer = exports.TimeoutError = exports.RequestError = exports.inspectAnyStringifyFn = exports.inspectAny = exports.tableDiff = exports.BaseWorkerClass = exports.transformMultiThreaded = exports.transformMapSync = exports.transformMap = exports.transformToNDJson = exports.bufferReviver = exports.transformJsonParse = exports.streamToNDJsonFile = exports.NDJsonStats = exports.pipelineToNDJsonFile = exports.pipelineFromNDJsonFile = exports.ndjsonStreamForEach = exports.slackDefaultMessagePrefixHook = exports.SlackService = exports.Debug = exports.Joi = exports.convert = exports.undefinedIfInvalid = exports.isValid = exports.getValidationResult = exports.validate = exports.JoiValidationError = void 0;
 const tslib_1 = require("tslib");
 const ajv_1 = require("ajv");
 exports.Ajv = ajv_1.default;
@@ -11,23 +11,23 @@ const buffer_util_1 = require("./buffer/buffer.util");
 Object.defineProperty(exports, "_chunkBuffer", { enumerable: true, get: function () { return buffer_util_1._chunkBuffer; } });
 const tableDiff_1 = require("./diff/tableDiff");
 Object.defineProperty(exports, "tableDiff", { enumerable: true, get: function () { return tableDiff_1.tableDiff; } });
-(0, tslib_1.__exportStar)(require("./got/getGot"), exports);
-(0, tslib_1.__exportStar)(require("./infra/process.util"), exports);
+tslib_1.__exportStar(require("./got/getGot"), exports);
+tslib_1.__exportStar(require("./infra/process.util"), exports);
 const debug_1 = require("./log/debug");
 Object.defineProperty(exports, "Debug", { enumerable: true, get: function () { return debug_1.Debug; } });
-(0, tslib_1.__exportStar)(require("./security/hash.util"), exports);
-(0, tslib_1.__exportStar)(require("./security/id.util"), exports);
-(0, tslib_1.__exportStar)(require("./security/secret.util"), exports);
-(0, tslib_1.__exportStar)(require("./colors/colors"), exports);
-(0, tslib_1.__exportStar)(require("./log/log.util"), exports);
+tslib_1.__exportStar(require("./security/hash.util"), exports);
+tslib_1.__exportStar(require("./security/id.util"), exports);
+tslib_1.__exportStar(require("./security/secret.util"), exports);
+tslib_1.__exportStar(require("./colors/colors"), exports);
+tslib_1.__exportStar(require("./log/log.util"), exports);
 const slack_service_1 = require("./slack/slack.service");
 Object.defineProperty(exports, "slackDefaultMessagePrefixHook", { enumerable: true, get: function () { return slack_service_1.slackDefaultMessagePrefixHook; } });
 Object.defineProperty(exports, "SlackService", { enumerable: true, get: function () { return slack_service_1.SlackService; } });
 const ndjson_model_1 = require("./stream/ndjson/ndjson.model");
 Object.defineProperty(exports, "NDJsonStats", { enumerable: true, get: function () { return ndjson_model_1.NDJsonStats; } });
-(0, tslib_1.__exportStar)(require("./stream/ndjson/ndJsonFileRead"), exports);
-(0, tslib_1.__exportStar)(require("./stream/ndjson/ndJsonFileWrite"), exports);
-(0, tslib_1.__exportStar)(require("./stream/ndjson/ndjsonMap"), exports);
+tslib_1.__exportStar(require("./stream/ndjson/ndJsonFileRead"), exports);
+tslib_1.__exportStar(require("./stream/ndjson/ndJsonFileWrite"), exports);
+tslib_1.__exportStar(require("./stream/ndjson/ndjsonMap"), exports);
 const ndjsonStreamForEach_1 = require("./stream/ndjson/ndjsonStreamForEach");
 Object.defineProperty(exports, "ndjsonStreamForEach", { enumerable: true, get: function () { return ndjsonStreamForEach_1.ndjsonStreamForEach; } });
 const pipelineFromNDJsonFile_1 = require("./stream/ndjson/pipelineFromNDJsonFile");
@@ -41,42 +41,41 @@ Object.defineProperty(exports, "bufferReviver", { enumerable: true, get: functio
 Object.defineProperty(exports, "transformJsonParse", { enumerable: true, get: function () { return transformJsonParse_1.transformJsonParse; } });
 const transformToNDJson_1 = require("./stream/ndjson/transformToNDJson");
 Object.defineProperty(exports, "transformToNDJson", { enumerable: true, get: function () { return transformToNDJson_1.transformToNDJson; } });
-(0, tslib_1.__exportStar)(require("./stream/pipeline/pipeline"), exports);
-(0, tslib_1.__exportStar)(require("./stream/readable/readableCreate"), exports);
-(0, tslib_1.__exportStar)(require("./stream/readable/readableForEach"), exports);
-(0, tslib_1.__exportStar)(require("./stream/readable/readableFromArray"), exports);
-(0, tslib_1.__exportStar)(require("./stream/readable/readableMap"), exports);
-(0, tslib_1.__exportStar)(require("./stream/readable/readableMapToArray"), exports);
-(0, tslib_1.__exportStar)(require("./stream/readable/readableToArray"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformBuffer"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformFilter"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformLimit"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformLogProgress"), exports);
+tslib_1.__exportStar(require("./stream/pipeline/pipeline"), exports);
+tslib_1.__exportStar(require("./stream/readable/readableCreate"), exports);
+tslib_1.__exportStar(require("./stream/readable/readableForEach"), exports);
+tslib_1.__exportStar(require("./stream/readable/readableFromArray"), exports);
+tslib_1.__exportStar(require("./stream/readable/readableMap"), exports);
+tslib_1.__exportStar(require("./stream/readable/readableMapToArray"), exports);
+tslib_1.__exportStar(require("./stream/readable/readableToArray"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformBuffer"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformFilter"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformLimit"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformLogProgress"), exports);
 const transformMap_1 = require("./stream/transform/transformMap");
 Object.defineProperty(exports, "transformMap", { enumerable: true, get: function () { return transformMap_1.transformMap; } });
-(0, tslib_1.__exportStar)(require("./stream/transform/transformMapSimple"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformNoOp"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformMapSimple"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformNoOp"), exports);
 const transformMapSync_1 = require("./stream/transform/transformMapSync");
 Object.defineProperty(exports, "transformMapSync", { enumerable: true, get: function () { return transformMapSync_1.transformMapSync; } });
-(0, tslib_1.__exportStar)(require("./stream/transform/transformSplit"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformTap"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformToArray"), exports);
-(0, tslib_1.__exportStar)(require("./stream/transform/transformToString"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformSplit"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformTap"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformToArray"), exports);
+tslib_1.__exportStar(require("./stream/transform/transformToString"), exports);
 const baseWorkerClass_1 = require("./stream/transform/worker/baseWorkerClass");
 Object.defineProperty(exports, "BaseWorkerClass", { enumerable: true, get: function () { return baseWorkerClass_1.BaseWorkerClass; } });
 const transformMultiThreaded_1 = require("./stream/transform/worker/transformMultiThreaded");
 Object.defineProperty(exports, "transformMultiThreaded", { enumerable: true, get: function () { return transformMultiThreaded_1.transformMultiThreaded; } });
-(0, tslib_1.__exportStar)(require("./stream/writable/writableForEach"), exports);
-(0, tslib_1.__exportStar)(require("./stream/writable/writableFork"), exports);
-(0, tslib_1.__exportStar)(require("./stream/writable/writablePushToArray"), exports);
-(0, tslib_1.__exportStar)(require("./stream/writable/writableVoid"), exports);
+tslib_1.__exportStar(require("./stream/writable/writableForEach"), exports);
+tslib_1.__exportStar(require("./stream/writable/writableFork"), exports);
+tslib_1.__exportStar(require("./stream/writable/writablePushToArray"), exports);
+tslib_1.__exportStar(require("./stream/writable/writableVoid"), exports);
 const inspectAny_1 = require("./string/inspectAny");
 Object.defineProperty(exports, "inspectAny", { enumerable: true, get: function () { return inspectAny_1.inspectAny; } });
 Object.defineProperty(exports, "inspectAnyStringifyFn", { enumerable: true, get: function () { return inspectAny_1.inspectAnyStringifyFn; } });
-(0, tslib_1.__exportStar)(require("./util/env.util"), exports);
-const lruMemoCache_1 = require("./util/lruMemoCache");
-Object.defineProperty(exports, "LRUMemoCache", { enumerable: true, get: function () { return lruMemoCache_1.LRUMemoCache; } });
-(0, tslib_1.__exportStar)(require("./util/zip.util"), exports);
+tslib_1.__exportStar(require("./util/env.util"), exports);
+tslib_1.__exportStar(require("./util/lruMemoCache"), exports);
+tslib_1.__exportStar(require("./util/zip.util"), exports);
 const ajv_util_1 = require("./validation/ajv/ajv.util");
 Object.defineProperty(exports, "readAjvSchemas", { enumerable: true, get: function () { return ajv_util_1.readAjvSchemas; } });
 Object.defineProperty(exports, "readJsonSchemas", { enumerable: true, get: function () { return ajv_util_1.readJsonSchemas; } });
@@ -84,10 +83,10 @@ const ajvSchema_1 = require("./validation/ajv/ajvSchema");
 Object.defineProperty(exports, "AjvSchema", { enumerable: true, get: function () { return ajvSchema_1.AjvSchema; } });
 const ajvValidationError_1 = require("./validation/ajv/ajvValidationError");
 Object.defineProperty(exports, "AjvValidationError", { enumerable: true, get: function () { return ajvValidationError_1.AjvValidationError; } });
-(0, tslib_1.__exportStar)(require("./validation/ajv/getAjv"), exports);
+tslib_1.__exportStar(require("./validation/ajv/getAjv"), exports);
 const joi_extensions_1 = require("./validation/joi/joi.extensions");
 Object.defineProperty(exports, "Joi", { enumerable: true, get: function () { return joi_extensions_1.Joi; } });
-(0, tslib_1.__exportStar)(require("./validation/joi/joi.shared.schemas"), exports);
+tslib_1.__exportStar(require("./validation/joi/joi.shared.schemas"), exports);
 const joi_validation_error_1 = require("./validation/joi/joi.validation.error");
 Object.defineProperty(exports, "JoiValidationError", { enumerable: true, get: function () { return joi_validation_error_1.JoiValidationError; } });
 const joi_validation_util_1 = require("./validation/joi/joi.validation.util");

package/dist/secret/secrets-decrypt.util.d.ts

@@ -8,4 +8,4 @@ export interface DecryptCLIOptions {
  * Decrypts all files in given directory (*.enc), saves decrypted versions without ending `.enc`.
  * Using provided encKey.
  */
-export declare function secretsDecrypt(dir: string[], encKey: string, algorithm?: string, del?: boolean): void;
+export declare function secretsDecrypt(dir: string[], encKey: string, del?: boolean): void;

package/dist/secret/secrets-decrypt.util.js

@@ -10,12 +10,12 @@ const crypto_util_1 = require("../security/crypto.util");
  * Decrypts all files in given directory (*.enc), saves decrypted versions without ending `.enc`.
  * Using provided encKey.
  */
-function secretsDecrypt(dir, encKey, algorithm, del) {
+function secretsDecrypt(dir, encKey, del) {
     const patterns = dir.map(d => `${d}/**/*.enc`);
     const filenames = globby.sync(patterns);
     filenames.forEach(filename => {
         const enc = fs.readFileSync(filename);
-        const plain = (0, crypto_util_1.decryptRandomIVBuffer)(enc, encKey, algorithm);
+        const plain = (0, crypto_util_1.decryptRandomIVBuffer)(enc, encKey);
         const plainFilename = filename.slice(0, filename.length - '.enc'.length);
         fs.writeFileSync(plainFilename, plain);
         if (del) {

package/dist/secret/secrets-encrypt.util.d.ts

@@ -8,4 +8,4 @@ export interface EncryptCLIOptions {
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
  * Using provided encKey.
  */
-export declare function secretsEncrypt(pattern: string[], encKey: string, algorithm?: string, del?: boolean): void;
+export declare function secretsEncrypt(pattern: string[], encKey: string, del?: boolean): void;

package/dist/secret/secrets-encrypt.util.js

@@ -10,7 +10,7 @@ const crypto_util_1 = require("../security/crypto.util");
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
  * Using provided encKey.
  */
-function secretsEncrypt(pattern, encKey, algorithm, del) {
+function secretsEncrypt(pattern, encKey, del) {
     const patterns = [
         ...pattern,
         `!**/*.enc`, // excluding already encoded
@@ -18,7 +18,7 @@ function secretsEncrypt(pattern, encKey, algorithm, del) {
     const filenames = globby.sync(patterns);
     filenames.forEach(filename => {
         const plain = fs.readFileSync(filename);
-        const enc = (0, crypto_util_1.encryptRandomIVBuffer)(plain, encKey, algorithm);
+        const enc = (0, crypto_util_1.encryptRandomIVBuffer)(plain, encKey);
         const encFilename = `${filename}.enc`;
         fs.writeFileSync(encFilename, enc);
         if (del) {

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

@@ -1,3 +1,17 @@
 /// <reference types="node" />
-export declare function encryptRandomIVBuffer(input: Buffer, secretKeyBase64: string, algorithm?: string): Buffer;
-export declare function decryptRandomIVBuffer(input: Buffer, secretKeyBase64: string, algorithm?: string): Buffer;
+/**
+ * Using aes-256-cbc
+ */
+export declare function encryptRandomIVBuffer(input: Buffer, secretKeyBase64: string): Buffer;
+/**
+ * Using aes-256-cbc
+ */
+export declare function decryptRandomIVBuffer(input: Buffer, secretKeyBase64: string): Buffer;
+/**
+ * Using aes-256-cbc
+ */
+export declare function decryptString(str: string, secretKey: string): string;
+/**
+ * Using aes-256-cbc
+ */
+export declare function encryptString(str: string, secretKey: string): string;

package/dist/security/crypto.util.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptRandomIVBuffer = exports.encryptRandomIVBuffer = void 0;
+exports.encryptString = exports.decryptString = exports.decryptRandomIVBuffer = exports.encryptRandomIVBuffer = void 0;
 const crypto = require("crypto");
 const hash_util_1 = require("./hash.util");
-// const randomBytes = promisify(crypto.randomBytes)
-function aes256Key(secretKeyBase64) {
-    // md5 to match aes-256 key length of 32 bytes
-    return (0, hash_util_1.md5)(Buffer.from(secretKeyBase64, 'base64'));
-}
-function encryptRandomIVBuffer(input, secretKeyBase64, algorithm = 'aes-256-cbc') {
+const algorithm = 'aes-256-cbc';
+/**
+ * Using aes-256-cbc
+ */
+function encryptRandomIVBuffer(input, secretKeyBase64) {
     const key = aes256Key(secretKeyBase64);
     // Random iv to achieve non-deterministic encryption (but deterministic decryption)
     // const iv = await randomBytes(16)
@@ -17,7 +16,10 @@ function encryptRandomIVBuffer(input, secretKeyBase64, algorithm = 'aes-256-cbc'
     return Buffer.concat([iv, cipher.update(input), cipher.final()]);
 }
 exports.encryptRandomIVBuffer = encryptRandomIVBuffer;
-function decryptRandomIVBuffer(input, secretKeyBase64, algorithm = 'aes-256-cbc') {
+/**
+ * Using aes-256-cbc
+ */
+function decryptRandomIVBuffer(input, secretKeyBase64) {
     const key = aes256Key(secretKeyBase64);
     // iv is first 16 bytes of encrypted buffer, the rest is payload
     const iv = input.slice(0, 16);
@@ -26,3 +28,32 @@ function decryptRandomIVBuffer(input, secretKeyBase64, algorithm = 'aes-256-cbc'
     return Buffer.concat([decipher.update(payload), decipher.final()]);
 }
 exports.decryptRandomIVBuffer = decryptRandomIVBuffer;
+/**
+ * Using aes-256-cbc
+ */
+function decryptString(str, secretKey) {
+    const { algorithm, key, iv } = getCryptoParams(secretKey);
+    const decipher = crypto.createDecipheriv(algorithm, key, iv);
+    let decrypted = decipher.update(str, 'base64', 'utf8');
+    return (decrypted += decipher.final('utf8'));
+}
+exports.decryptString = decryptString;
+/**
+ * Using aes-256-cbc
+ */
+function encryptString(str, secretKey) {
+    const { algorithm, key, iv } = getCryptoParams(secretKey);
+    const cipher = crypto.createCipheriv(algorithm, key, iv);
+    let encrypted = cipher.update(str, 'utf8', 'base64');
+    return (encrypted += cipher.final('base64'));
+}
+exports.encryptString = encryptString;
+function getCryptoParams(secretKey) {
+    const key = (0, hash_util_1.md5)(secretKey);
+    const iv = (0, hash_util_1.md5)(secretKey + key).slice(0, 16);
+    return { algorithm, key, iv };
+}
+function aes256Key(secretKeyBase64) {
+    // md5 to match aes-256 key length of 32 bytes
+    return (0, hash_util_1.md5)(Buffer.from(secretKeyBase64, 'base64'));
+}

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

@@ -14,8 +14,16 @@ export declare function removeSecretsFromEnv(): void;
  * Does NOT delete previous secrets from secretMap.
  *
  * If SECRET_ENCRYPTION_KEY argument is passed - will decrypt the contents of the file first, before parsing it as JSON.
+ *
+ * Whole file is encrypted.
+ * For "json-values encrypted" style - use `loadSecretsFromEncryptedJsonFileValues`
+ */
+export declare function loadSecretsFromEncryptedJsonFile(filePath: string, secretEncryptionKey?: string): void;
+/**
+ * Whole file is NOT encrypted, but instead individual json values ARE encrypted..
+ * For whole-file encryption - use `loadSecretsFromEncryptedJsonFile`
  */
-export declare function loadSecretsFromJsonFile(filePath: string, SECRET_ENCRYPTION_KEY?: string): void;
+export declare function loadSecretsFromEncryptedJsonFileValues(filePath: string, secretEncryptionKey?: string): void;
 /**
  * json secrets are always base64'd
  */

package/dist/security/secret.util.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setSecretMap = exports.getSecretMap = exports.secretOptional = exports.secret = exports.loadSecretsFromJsonFile = exports.removeSecretsFromEnv = exports.loadSecretsFromEnv = void 0;
+exports.setSecretMap = exports.getSecretMap = exports.secretOptional = exports.secret = exports.loadSecretsFromEncryptedJsonFileValues = exports.loadSecretsFromEncryptedJsonFile = exports.removeSecretsFromEnv = exports.loadSecretsFromEnv = void 0;
 const fs = require("fs");
+const js_lib_1 = require("@naturalcycles/js-lib");
 const __1 = require("..");
 const crypto_util_1 = require("./crypto.util");
 let loaded = false;
@@ -39,16 +40,17 @@ exports.removeSecretsFromEnv = removeSecretsFromEnv;
  * Does NOT delete previous secrets from secretMap.
  *
  * If SECRET_ENCRYPTION_KEY argument is passed - will decrypt the contents of the file first, before parsing it as JSON.
+ *
+ * Whole file is encrypted.
+ * For "json-values encrypted" style - use `loadSecretsFromEncryptedJsonFileValues`
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-function loadSecretsFromJsonFile(filePath, SECRET_ENCRYPTION_KEY) {
-    if (!fs.existsSync(filePath)) {
-        throw new Error(`loadSecretsFromPlainJsonFile() cannot load from path: ${filePath}`);
-    }
+function loadSecretsFromEncryptedJsonFile(filePath, secretEncryptionKey) {
+    (0, js_lib_1._assert)(fs.existsSync(filePath), `loadSecretsFromEncryptedJsonFile() cannot load from path: ${filePath}`);
     let secrets;
-    if (SECRET_ENCRYPTION_KEY) {
+    if (secretEncryptionKey) {
         const buf = fs.readFileSync(filePath);
-        const plain = (0, crypto_util_1.decryptRandomIVBuffer)(buf, SECRET_ENCRYPTION_KEY).toString('utf8');
+        const plain = (0, crypto_util_1.decryptRandomIVBuffer)(buf, secretEncryptionKey).toString('utf8');
         secrets = JSON.parse(plain);
     }
     else {
@@ -60,7 +62,26 @@ function loadSecretsFromJsonFile(filePath, SECRET_ENCRYPTION_KEY) {
         .map(s => s.toUpperCase())
         .join(', ')}`);
 }
-exports.loadSecretsFromJsonFile = loadSecretsFromJsonFile;
+exports.loadSecretsFromEncryptedJsonFile = loadSecretsFromEncryptedJsonFile;
+/**
+ * Whole file is NOT encrypted, but instead individual json values ARE encrypted..
+ * For whole-file encryption - use `loadSecretsFromEncryptedJsonFile`
+ */
+function loadSecretsFromEncryptedJsonFileValues(filePath, secretEncryptionKey) {
+    (0, js_lib_1._assert)(fs.existsSync(filePath), `loadSecretsFromEncryptedJsonFileValues() cannot load from path: ${filePath}`);
+    const secrets = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    if (secretEncryptionKey) {
+        (0, js_lib_1._stringMapEntries)(secrets).forEach(([k, enc]) => {
+            secrets[k] = (0, crypto_util_1.decryptString)(enc, secretEncryptionKey);
+        });
+    }
+    Object.entries(secrets).forEach(([k, v]) => (secretMap[k.toUpperCase()] = v));
+    loaded = true;
+    console.log(`${Object.keys(secrets).length} secret(s) loaded from ${filePath}: ${Object.keys(secrets)
+        .map(s => s.toUpperCase())
+        .join(', ')}`);
+}
+exports.loadSecretsFromEncryptedJsonFileValues = loadSecretsFromEncryptedJsonFileValues;
 /**
  * json secrets are always base64'd
  */

package/dist/util/lruMemoCache.d.ts

@@ -1,6 +1,7 @@
 import { MemoCache } from '@naturalcycles/js-lib';
 import LRUCache = require('lru-cache');
-export declare type LRUMemoCacheOpts = LRUCache.Options<string, any>;
+export interface LRUMemoCacheOptions<KEY, VALUE> extends Partial<LRUCache.Options<KEY, VALUE>> {
+}
 /**
  * @example
  * Use it like this:
@@ -8,8 +9,8 @@ export declare type LRUMemoCacheOpts = LRUCache.Options<string, any>;
  * @_Memo({ cacheFactory: () => new LRUMemoCache({...}) })
  * method1 ()
  */
-export declare class LRUMemoCache implements MemoCache {
-    constructor(opt: LRUMemoCacheOpts);
+export declare class LRUMemoCache<KEY = any, VALUE = any> implements MemoCache<KEY, VALUE> {
+    constructor(opt: LRUMemoCacheOptions<KEY, VALUE>);
     private lru;
     has(k: any): boolean;
     get(k: any): any;

package/dist/util/lruMemoCache.js

@@ -11,7 +11,10 @@ const LRUCache = require("lru-cache");
  */
 class LRUMemoCache {
     constructor(opt) {
-        this.lru = new LRUCache(opt);
+        this.lru = new LRUCache({
+            max: 100,
+            ...opt,
+        });
     }
     has(k) {
         return this.lru.has(k);

package/package.json

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

package/src/bin/secrets-decrypt.ts

@@ -6,15 +6,15 @@ import { runScript } from '../script'
 import { DecryptCLIOptions, secretsDecrypt } from '../secret/secrets-decrypt.util'
 
 runScript(() => {
-  const { dir, encKey, algorithm, del } = getDecryptCLIOptions()
+  const { dir, encKey, del } = getDecryptCLIOptions()
 
-  secretsDecrypt(dir, encKey, algorithm, del)
+  secretsDecrypt(dir, encKey, del)
 })
 
 function getDecryptCLIOptions(): DecryptCLIOptions {
   require('dotenv').config()
 
-  let { dir, encKey, encKeyVar, algorithm, del } = yargs.options({
+  let { dir, encKey, encKeyVar, del } = yargs.options({
     dir: {
       type: 'array',
       desc: 'Directory with secrets. Can be many',
@@ -32,10 +32,10 @@ function getDecryptCLIOptions(): DecryptCLIOptions {
       desc: 'Env variable name to get `encKey` from.',
       default: 'SECRET_ENCRYPTION_KEY',
     },
-    algorithm: {
-      type: 'string',
-      default: 'aes-256-cbc',
-    },
+    // algorithm: {
+    //   type: 'string',
+    //   default: 'aes-256-cbc',
+    // },
     del: {
       type: 'boolean',
       desc: 'Delete source files after encryption/decryption. Be careful!',
@@ -55,5 +55,5 @@ function getDecryptCLIOptions(): DecryptCLIOptions {
   }
 
   // `as any` because @types/yargs can't handle string[] type properly
-  return { dir: dir as any, encKey, algorithm, del }
+  return { dir: dir as any, encKey, del }
 }

package/src/bin/secrets-encrypt.ts

@@ -6,15 +6,15 @@ import { runScript } from '../script'
 import { EncryptCLIOptions, secretsEncrypt } from '../secret/secrets-encrypt.util'
 
 runScript(() => {
-  const { pattern, encKey, algorithm, del } = getEncryptCLIOptions()
+  const { pattern, encKey, del } = getEncryptCLIOptions()
 
-  secretsEncrypt(pattern, encKey, algorithm, del)
+  secretsEncrypt(pattern, encKey, del)
 })
 
 function getEncryptCLIOptions(): EncryptCLIOptions {
   require('dotenv').config()
 
-  let { pattern, encKey, encKeyVar, algorithm, del } = yargs.options({
+  let { pattern, encKey, encKeyVar, del } = yargs.options({
     pattern: {
       type: 'string',
       array: true,
@@ -33,10 +33,10 @@ function getEncryptCLIOptions(): EncryptCLIOptions {
       desc: 'Env variable name to get `encKey` from.',
       default: 'SECRET_ENCRYPTION_KEY',
     },
-    algorithm: {
-      type: 'string',
-      default: 'aes-256-cbc',
-    },
+    // algorithm: {
+    //   type: 'string',
+    //   default: 'aes-256-cbc',
+    // },
     del: {
       type: 'boolean',
       desc: 'Delete source files after encryption/decryption. Be careful!',
@@ -56,5 +56,5 @@ function getEncryptCLIOptions(): EncryptCLIOptions {
   }
 
   // `as any` because @types/yargs can't handle string[] type properly
-  return { pattern: pattern as any, encKey, algorithm, del }
+  return { pattern: pattern as any, encKey, del }
 }

package/src/got/getGot.ts

@@ -207,7 +207,9 @@ function gotBeforeRetryHook(opt: GetGotOptions): BeforeRetryHook {
 
     if (statusCode && statusCode < 300) {
       // todo: possibly remove the log message completely in the future
-      opt.logger!.log(`skipping got.beforeRetry hook at statusCode is ${statusCode}`)
+      opt.logger!.log(
+        `skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`,
+      )
       return
     }
 

package/src/index.ts

@@ -81,7 +81,7 @@ export * from './stream/writable/writablePushToArray'
 export * from './stream/writable/writableVoid'
 import { inspectAny, InspectAnyOptions, inspectAnyStringifyFn } from './string/inspectAny'
 export * from './util/env.util'
-import { LRUMemoCache } from './util/lruMemoCache'
+export * from './util/lruMemoCache'
 export * from './util/zip.util'
 import { readAjvSchemas, readJsonSchemas } from './validation/ajv/ajv.util'
 import { AjvSchema, AjvSchemaCfg, AjvValidationOptions } from './validation/ajv/ajvSchema'
@@ -165,7 +165,6 @@ export {
   undefinedIfInvalid,
   convert,
   Joi,
-  LRUMemoCache,
   Debug,
   SlackService,
   slackDefaultMessagePrefixHook,

package/src/secret/secrets-decrypt.util.ts

@@ -15,19 +15,14 @@ export interface DecryptCLIOptions {
  * Decrypts all files in given directory (*.enc), saves decrypted versions without ending `.enc`.
  * Using provided encKey.
  */
-export function secretsDecrypt(
-  dir: string[],
-  encKey: string,
-  algorithm?: string,
-  del?: boolean,
-): void {
+export function secretsDecrypt(dir: string[], encKey: string, del?: boolean): void {
   const patterns = dir.map(d => `${d}/**/*.enc`)
 
   const filenames = globby.sync(patterns)
 
   filenames.forEach(filename => {
     const enc = fs.readFileSync(filename)
-    const plain = decryptRandomIVBuffer(enc, encKey, algorithm)
+    const plain = decryptRandomIVBuffer(enc, encKey)
 
     const plainFilename = filename.slice(0, filename.length - '.enc'.length)
     fs.writeFileSync(plainFilename, plain)

package/src/secret/secrets-encrypt.util.ts

@@ -15,12 +15,7 @@ export interface EncryptCLIOptions {
  * Encrypts all files in given directory (except *.enc), saves encrypted versions as filename.ext.enc.
  * Using provided encKey.
  */
-export function secretsEncrypt(
-  pattern: string[],
-  encKey: string,
-  algorithm?: string,
-  del?: boolean,
-): void {
+export function secretsEncrypt(pattern: string[], encKey: string, del?: boolean): void {
   const patterns = [
     ...pattern,
     `!**/*.enc`, // excluding already encoded
@@ -29,7 +24,7 @@ export function secretsEncrypt(
 
   filenames.forEach(filename => {
     const plain = fs.readFileSync(filename)
-    const enc = encryptRandomIVBuffer(plain, encKey, algorithm)
+    const enc = encryptRandomIVBuffer(plain, encKey)
 
     const encFilename = `${filename}.enc`
     fs.writeFileSync(encFilename, enc)

package/src/security/crypto.util.ts

@@ -1,18 +1,12 @@
 import * as crypto from 'crypto'
 import { md5 } from './hash.util'
 
-// const randomBytes = promisify(crypto.randomBytes)
+const algorithm = 'aes-256-cbc'
 
-function aes256Key(secretKeyBase64: string): string {
-  // md5 to match aes-256 key length of 32 bytes
-  return md5(Buffer.from(secretKeyBase64, 'base64'))
-}
-
-export function encryptRandomIVBuffer(
-  input: Buffer,
-  secretKeyBase64: string,
-  algorithm = 'aes-256-cbc',
-): Buffer {
+/**
+ * Using aes-256-cbc
+ */
+export function encryptRandomIVBuffer(input: Buffer, secretKeyBase64: string): Buffer {
   const key = aes256Key(secretKeyBase64)
 
   // Random iv to achieve non-deterministic encryption (but deterministic decryption)
@@ -24,11 +18,10 @@ export function encryptRandomIVBuffer(
   return Buffer.concat([iv, cipher.update(input), cipher.final()])
 }
 
-export function decryptRandomIVBuffer(
-  input: Buffer,
-  secretKeyBase64: string,
-  algorithm = 'aes-256-cbc',
-): Buffer {
+/**
+ * Using aes-256-cbc
+ */
+export function decryptRandomIVBuffer(input: Buffer, secretKeyBase64: string): Buffer {
   const key = aes256Key(secretKeyBase64)
 
   // iv is first 16 bytes of encrypted buffer, the rest is payload
@@ -39,3 +32,34 @@ export function decryptRandomIVBuffer(
 
   return Buffer.concat([decipher.update(payload), decipher.final()])
 }
+
+/**
+ * Using aes-256-cbc
+ */
+export function decryptString(str: string, secretKey: string): string {
+  const { algorithm, key, iv } = getCryptoParams(secretKey)
+  const decipher = crypto.createDecipheriv(algorithm, key, iv)
+  let decrypted = decipher.update(str, 'base64', 'utf8')
+  return (decrypted += decipher.final('utf8'))
+}
+
+/**
+ * Using aes-256-cbc
+ */
+export function encryptString(str: string, secretKey: string): string {
+  const { algorithm, key, iv } = getCryptoParams(secretKey)
+  const cipher = crypto.createCipheriv(algorithm, key, iv)
+  let encrypted = cipher.update(str, 'utf8', 'base64')
+  return (encrypted += cipher.final('base64'))
+}
+
+function getCryptoParams(secretKey: string): { algorithm: string; key: string; iv: string } {
+  const key = md5(secretKey)
+  const iv = md5(secretKey + key).slice(0, 16)
+  return { algorithm, key, iv }
+}
+
+function aes256Key(secretKeyBase64: string): string {
+  // md5 to match aes-256 key length of 32 bytes
+  return md5(Buffer.from(secretKeyBase64, 'base64'))
+}

package/src/security/secret.util.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs'
-import { StringMap } from '@naturalcycles/js-lib'
+import { _assert, _stringMapEntries, StringMap } from '@naturalcycles/js-lib'
 import { base64ToString } from '..'
-import { decryptRandomIVBuffer } from './crypto.util'
+import { decryptRandomIVBuffer, decryptString } from './crypto.util'
 
 let loaded = false
 
@@ -46,18 +46,25 @@ export function removeSecretsFromEnv(): void {
  * Does NOT delete previous secrets from secretMap.
  *
  * If SECRET_ENCRYPTION_KEY argument is passed - will decrypt the contents of the file first, before parsing it as JSON.
+ *
+ * Whole file is encrypted.
+ * For "json-values encrypted" style - use `loadSecretsFromEncryptedJsonFileValues`
  */
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export function loadSecretsFromJsonFile(filePath: string, SECRET_ENCRYPTION_KEY?: string): void {
-  if (!fs.existsSync(filePath)) {
-    throw new Error(`loadSecretsFromPlainJsonFile() cannot load from path: ${filePath}`)
-  }
+export function loadSecretsFromEncryptedJsonFile(
+  filePath: string,
+  secretEncryptionKey?: string,
+): void {
+  _assert(
+    fs.existsSync(filePath),
+    `loadSecretsFromEncryptedJsonFile() cannot load from path: ${filePath}`,
+  )
 
   let secrets: StringMap
 
-  if (SECRET_ENCRYPTION_KEY) {
+  if (secretEncryptionKey) {
     const buf = fs.readFileSync(filePath)
-    const plain = decryptRandomIVBuffer(buf, SECRET_ENCRYPTION_KEY).toString('utf8')
+    const plain = decryptRandomIVBuffer(buf, secretEncryptionKey).toString('utf8')
     secrets = JSON.parse(plain)
   } else {
     secrets = JSON.parse(fs.readFileSync(filePath, 'utf8'))
@@ -73,6 +80,37 @@ export function loadSecretsFromJsonFile(filePath: string, SECRET_ENCRYPTION_KEY?
   )
 }
 
+/**
+ * Whole file is NOT encrypted, but instead individual json values ARE encrypted..
+ * For whole-file encryption - use `loadSecretsFromEncryptedJsonFile`
+ */
+export function loadSecretsFromEncryptedJsonFileValues(
+  filePath: string,
+  secretEncryptionKey?: string,
+): void {
+  _assert(
+    fs.existsSync(filePath),
+    `loadSecretsFromEncryptedJsonFileValues() cannot load from path: ${filePath}`,
+  )
+
+  const secrets: StringMap = JSON.parse(fs.readFileSync(filePath, 'utf8'))
+
+  if (secretEncryptionKey) {
+    _stringMapEntries(secrets).forEach(([k, enc]) => {
+      secrets[k] = decryptString(enc, secretEncryptionKey)
+    })
+  }
+
+  Object.entries(secrets).forEach(([k, v]) => (secretMap[k.toUpperCase()] = v))
+
+  loaded = true
+  console.log(
+    `${Object.keys(secrets).length} secret(s) loaded from ${filePath}: ${Object.keys(secrets)
+      .map(s => s.toUpperCase())
+      .join(', ')}`,
+  )
+}
+
 /**
  * json secrets are always base64'd
  */

package/src/util/lruMemoCache.ts

@@ -1,7 +1,8 @@
 import { MemoCache } from '@naturalcycles/js-lib'
 import LRUCache = require('lru-cache')
 
-export type LRUMemoCacheOpts = LRUCache.Options<string, any>
+// Partial, to be able to provide default `max`
+export interface LRUMemoCacheOptions<KEY, VALUE> extends Partial<LRUCache.Options<KEY, VALUE>> {}
 
 /**
  * @example
@@ -10,12 +11,15 @@ export type LRUMemoCacheOpts = LRUCache.Options<string, any>
  * @_Memo({ cacheFactory: () => new LRUMemoCache({...}) })
  * method1 ()
  */
-export class LRUMemoCache implements MemoCache {
-  constructor(opt: LRUMemoCacheOpts) {
-    this.lru = new LRUCache<string, any>(opt)
+export class LRUMemoCache<KEY = any, VALUE = any> implements MemoCache<KEY, VALUE> {
+  constructor(opt: LRUMemoCacheOptions<KEY, VALUE>) {
+    this.lru = new LRUCache<KEY, VALUE>({
+      max: 100,
+      ...opt,
+    })
   }
 
-  private lru!: LRUCache<string, any>
+  private lru!: LRUCache<KEY, VALUE>
 
   has(k: any): boolean {
     return this.lru.has(k)