@naturalcycles/nodejs-lib 12.98.1 → 12.98.3

package/dist/fs/json2env.d.ts

@@ -55,5 +55,7 @@ export declare function objectToShellExport(obj: AnyObject, prefix?: string): st
  *
  * Quotes are important, otherwise it'll break on e.g space character in the value.
  * Includes trailing newline for composability.
+ *
+ * UPD: Quoted values behave inconsistently, so we're trying to NOT quote now, and-see-what-happens.
  */
 export declare function objectToGithubActionsEnv(obj: AnyObject, prefix?: string): string;

package/dist/fs/json2env.js

@@ -114,6 +114,8 @@ exports.objectToShellExport = objectToShellExport;
  *
  * Quotes are important, otherwise it'll break on e.g space character in the value.
  * Includes trailing newline for composability.
+ *
+ * UPD: Quoted values behave inconsistently, so we're trying to NOT quote now, and-see-what-happens.
  */
 function objectToGithubActionsEnv(obj, prefix = '') {
     if (!Object.keys(obj).length)
@@ -121,7 +123,7 @@ function objectToGithubActionsEnv(obj, prefix = '') {
     return (Object.entries(obj)
         .map(([k, v]) => {
         if (v) {
-            return `${prefix}${k}="${v}"`;
+            return `${prefix}${k}=${v}`;
         }
     })
         .filter(Boolean)

package/dist/infra/process.util.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSharedUtil = exports.memoryUsageFull = exports.memoryUsage = void 0;
 const os = require("node:os");
 const js_lib_1 = require("@naturalcycles/js-lib");
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 function memoryUsage() {
     const { rss, external, heapUsed, heapTotal } = process.memoryUsage();
     return {

package/dist/jwt/jwt.service.js

@@ -7,6 +7,9 @@ exports.jsonwebtoken = jsonwebtoken;
 const joi_shared_schemas_1 = require("../validation/joi/joi.shared.schemas");
 const joi_validation_util_1 = require("../validation/joi/joi.validation.util");
 // todo: define JWTError and list possible options
+// jwt expired (TokenExpiredError)
+// jwt invalid
+// jwt token is empty
 /**
  * Wraps popular `jsonwebtoken` library.
  * You should create one instance of JWTService for each pair of private/public key.
@@ -49,7 +52,6 @@ class JWTService {
         }
         catch (err) {
             if (this.cfg.errorData) {
-                (0, js_lib_1._typeCast)(err);
                 (0, js_lib_1._errorDataAppend)(err, {
                     ...this.cfg.errorData,
                 });
@@ -61,7 +63,7 @@ class JWTService {
         const data = jsonwebtoken.decode(token, {
             complete: true,
         });
-        (0, js_lib_1._assert)(data, 'invalid token, decoded value is null', {
+        (0, js_lib_1._assert)(data?.payload, 'invalid token, decoded value is empty', {
             ...this.cfg.errorData,
         });
         (0, joi_validation_util_1.validate)(data.payload, schema || joi_shared_schemas_1.anyObjectSchema);

package/dist/util/buildInfo.util.js

@@ -7,7 +7,6 @@ const git_util_1 = require("./git.util");
 function generateBuildInfo() {
     const now = (0, js_lib_1.localTime)();
     const ts = now.unix();
-    const tsStr = now.toPretty();
     const rev = (0, git_util_1.gitCurrentCommitSha)();
     const branchName = (0, git_util_1.gitCurrentBranchName)();
     const repoName = (0, git_util_1.gitCurrentRepoName)();
@@ -27,7 +26,6 @@ function generateBuildInfo() {
     return (0, js_lib_1._filterUndefinedValues)({
         ts,
         tsCommit,
-        tsStr,
         repoName,
         branchName,
         rev,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.98.1",
+  "version": "12.98.3",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -41,7 +41,7 @@
     "@types/yargs": "^16.0.0",
     "jest": "^29.0.0",
     "nock": "^13.0.2",
-    "prettier": "^2.0.0",
+    "prettier": "^3.0.0",
     "vue-class-component": "^7.2.6",
     "vuepress": "^1.7.1",
     "vuepress-plugin-typescript": "^0.3.1"

package/src/fs/json2env.ts

@@ -156,6 +156,8 @@ export function objectToShellExport(obj: AnyObject, prefix = ''): string {
  *
  * Quotes are important, otherwise it'll break on e.g space character in the value.
  * Includes trailing newline for composability.
+ *
+ * UPD: Quoted values behave inconsistently, so we're trying to NOT quote now, and-see-what-happens.
  */
 export function objectToGithubActionsEnv(obj: AnyObject, prefix = ''): string {
   if (!Object.keys(obj).length) return ''
@@ -164,7 +166,7 @@ export function objectToGithubActionsEnv(obj: AnyObject, prefix = ''): string {
     Object.entries(obj)
       .map(([k, v]) => {
         if (v) {
-          return `${prefix}${k}="${v}"`
+          return `${prefix}${k}=${v}`
         }
       })
       .filter(Boolean)

package/src/infra/process.util.ts

@@ -1,9 +1,12 @@
 import * as os from 'node:os'
 import { _mb } from '@naturalcycles/js-lib'
 
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
-export function memoryUsage() {
+export function memoryUsage(): {
+  rss: number
+  heapTotal: number
+  heapUsed: number
+  external: number
+} {
   const { rss, external, heapUsed, heapTotal } = process.memoryUsage()
   return {
     rss: _mb(rss),
@@ -13,7 +16,15 @@ export function memoryUsage() {
   }
 }
 
-export function memoryUsageFull() {
+export function memoryUsageFull(): {
+  rss: number
+  heapTotal: number
+  heapUsed: number
+  external: number
+  totalMem: number
+  freeMem: number
+  usedMem: number
+} {
   const { rss, external, heapUsed, heapTotal } = process.memoryUsage()
   const totalMem = os.totalmem()
   const freeMem = os.freemem()
@@ -81,7 +92,10 @@ class ProcessUtil {
     })
   }
 
-  private getCPUInfo() {
+  private getCPUInfo(): {
+    idle: number
+    total: number
+  } {
     // eslint-disable-next-line unicorn/no-array-reduce
     return os.cpus().reduce(
       (r, cpu) => {

package/src/jwt/jwt.service.ts

@@ -1,11 +1,4 @@
-import {
-  _assert,
-  _errorDataAppend,
-  _typeCast,
-  AnyObject,
-  ErrorData,
-  JWTString,
-} from '@naturalcycles/js-lib'
+import { _assert, _errorDataAppend, AnyObject, ErrorData, JWTString } from '@naturalcycles/js-lib'
 import type { Algorithm, VerifyOptions, JwtHeader, SignOptions } from 'jsonwebtoken'
 import * as jsonwebtoken from 'jsonwebtoken'
 import { AnySchemaTyped } from '../validation/joi/joi.model'
@@ -51,6 +44,9 @@ export interface JWTServiceCfg {
 }
 
 // todo: define JWTError and list possible options
+// jwt expired (TokenExpiredError)
+// jwt invalid
+// jwt token is empty
 
 /**
  * Wraps popular `jsonwebtoken` library.
@@ -113,7 +109,6 @@ export class JWTService {
       return data
     } catch (err) {
       if (this.cfg.errorData) {
-        _typeCast<Error>(err)
         _errorDataAppend(err, {
           ...this.cfg.errorData,
         })
@@ -138,7 +133,7 @@ export class JWTService {
       signature: string
     } | null
 
-    _assert(data, 'invalid token, decoded value is null', {
+    _assert(data?.payload, 'invalid token, decoded value is empty', {
       ...this.cfg.errorData,
     })
 

package/src/stream/sizeStack.ts

@@ -3,7 +3,10 @@ import { yellow } from '../colors'
 import { gzipBuffer } from '../util/zip.util'
 
 export class SizeStack extends NumberStack {
-  constructor(public name: string, size: number) {
+  constructor(
+    public name: string,
+    size: number,
+  ) {
     super(size)
   }
 

package/src/util/buildInfo.util.ts

@@ -10,7 +10,6 @@ import {
 export function generateBuildInfo(): BuildInfo {
   const now = localTime()
   const ts = now.unix()
-  const tsStr = now.toPretty()
 
   const rev = gitCurrentCommitSha()
   const branchName = gitCurrentBranchName()
@@ -34,7 +33,6 @@ export function generateBuildInfo(): BuildInfo {
   return _filterUndefinedValues({
     ts,
     tsCommit,
-    tsStr,
     repoName,
     branchName,
     rev,

package/src/util/env.util.ts

@@ -13,12 +13,15 @@ export function requireEnvKeys<T extends readonly string[]>(
   ...keys: T
 ): { [k in ValuesOf<T>]: string } {
   // eslint-disable-next-line unicorn/no-array-reduce
-  return keys.reduce((r, k) => {
-    const v = process.env[k]
-    if (!v) throw new Error(`${k} env variable is required, but missing`)
-    r[k as ValuesOf<T>] = v
-    return r
-  }, {} as { [k in ValuesOf<T>]: string })
+  return keys.reduce(
+    (r, k) => {
+      const v = process.env[k]
+      if (!v) throw new Error(`${k} env variable is required, but missing`)
+      r[k as ValuesOf<T>] = v
+      return r
+    },
+    {} as { [k in ValuesOf<T>]: string },
+  )
 }
 
 export function requireFileToExist(filePath: string): void {

package/src/validation/ajv/ajvSchema.ts

@@ -78,7 +78,10 @@ export interface AjvSchemaCfg {
  * @experimental
  */
 export class AjvSchema<T = unknown> {
-  private constructor(public schema: JsonSchema<T>, cfg: Partial<AjvSchemaCfg> = {}) {
+  private constructor(
+    public schema: JsonSchema<T>,
+    cfg: Partial<AjvSchemaCfg> = {},
+  ) {
     this.cfg = {
       logErrors: true,
       logger: console,