@naturalcycles/nodejs-lib 12.70.1 → 12.73.0

package/dist/bin/json2env.js

@@ -19,6 +19,11 @@ const script_1 = require("../script");
             desc: 'Populate $BASH_ENV file if BASH_ENV env variable exists',
             default: true,
         },
+        githubEnv: {
+            type: 'boolean',
+            desc: 'Populate $GITHUB_ENV file if GITHUB_ENV env variable exists',
+            default: true,
+        },
         fail: {
             type: 'boolean',
             desc: 'Fail (exit status 1) on non-existing input file',
@@ -31,7 +36,7 @@ const script_1 = require("../script");
             type: 'boolean',
         },
     });
-    const { _: args, prefix, saveEnvFile, bashEnv, fail, debug, silent } = argv;
+    const { _: args, prefix, saveEnvFile, bashEnv, githubEnv, fail, debug, silent } = argv;
     if (debug)
         console.log({ argv });
     const jsonPath = args[0];
@@ -40,6 +45,7 @@ const script_1 = require("../script");
         prefix,
         saveEnvFile,
         bashEnv,
+        githubEnv,
         fail,
         debug,
         silent,

package/dist/fs/json2env.d.ts

@@ -9,6 +9,10 @@ export interface Json2EnvOptions {
      * @default true
      */
     bashEnv?: boolean;
+    /**
+     * @default true
+     */
+    githubEnv?: boolean;
     /**
      * @default true
      */
@@ -29,3 +33,15 @@ export declare function json2env(opt: Json2EnvOptions): void;
  * export b="c"
  */
 export declare function objectToShellExport(o: any, prefix?: string): string;
+/**
+ * Turns Object with keys/values into a file of key-value pairs
+ *
+ * @example
+ * { a: 'b', b: 'c'}
+ *
+ * will turn into:
+ *
+ * a=b
+ * b=c
+ */
+export declare function objectToGithubActionsEnv(o: any, prefix?: string): string;

package/dist/fs/json2env.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.objectToShellExport = exports.json2env = void 0;
+exports.objectToGithubActionsEnv = exports.objectToShellExport = exports.json2env = void 0;
 const fs = require("fs-extra");
 const colors_1 = require("../colors");
 const JSON2ENV_OPT_DEF = {
     saveEnvFile: true,
     bashEnv: true,
+    githubEnv: true,
     fail: true,
 };
 function json2env(opt) {
-    const { jsonPath, prefix, saveEnvFile, bashEnv, fail, debug, silent } = {
+    const { jsonPath, prefix, saveEnvFile, bashEnv, githubEnv, fail, debug, silent } = {
         ...JSON2ENV_OPT_DEF,
         ...opt,
     };
@@ -28,8 +29,9 @@ function json2env(opt) {
     // read file
     const json = fs.readJsonSync(jsonPath);
     const exportStr = objectToShellExport(json, prefix);
+    const githubStr = objectToGithubActionsEnv(json, prefix);
     if (debug) {
-        console.log(json, exportStr);
+        console.log(json, exportStr, githubStr);
     }
     if (saveEnvFile) {
         const shPath = `${jsonPath}.sh`;
@@ -42,6 +44,9 @@ function json2env(opt) {
     if (bashEnv) {
         appendBashEnv(exportStr);
     }
+    if (githubEnv) {
+        appendGithubEnv(githubStr);
+    }
 }
 exports.json2env = json2env;
 function appendBashEnv(exportStr) {
@@ -51,6 +56,13 @@ function appendBashEnv(exportStr) {
         console.log(`BASH_ENV file appended (${(0, colors_1.dimGrey)(BASH_ENV)})`);
     }
 }
+function appendGithubEnv(exportStr) {
+    const { GITHUB_ENV } = process.env;
+    if (GITHUB_ENV) {
+        fs.appendFileSync(GITHUB_ENV, exportStr + '\n');
+        console.log(`GITHUB_ENV file appended (${(0, colors_1.dimGrey)(GITHUB_ENV)})`);
+    }
+}
 /**
  * Turns Object with keys/values into a *.sh script that exports all keys as values.
  *
@@ -74,3 +86,26 @@ function objectToShellExport(o, prefix = '') {
         .join('\n');
 }
 exports.objectToShellExport = objectToShellExport;
+/**
+ * Turns Object with keys/values into a file of key-value pairs
+ *
+ * @example
+ * { a: 'b', b: 'c'}
+ *
+ * will turn into:
+ *
+ * a=b
+ * b=c
+ */
+function objectToGithubActionsEnv(o, prefix = '') {
+    return Object.keys(o)
+        .map(k => {
+        const v = o[k];
+        if (v) {
+            return `${prefix}${k}=${v}`;
+        }
+    })
+        .filter(Boolean)
+        .join('\n');
+}
+exports.objectToGithubActionsEnv = objectToGithubActionsEnv;

package/dist/got/getGot.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGot = void 0;
+const url_1 = require("url");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const got_1 = require("got");
 const __1 = require("..");
@@ -180,7 +181,9 @@ 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 as statusCode is ${statusCode}, err.msg is ${err?.message}`);
+            // opt.logger!.log(
+            //   `skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`,
+            // )
             return;
         }
         const { method, url, prefixUrl } = options;
@@ -242,6 +245,10 @@ function gotAfterResponseHook(opt = {}) {
     };
 }
 function getShortUrl(opt, url, prefixUrl) {
+    if (url.password) {
+        url = new url_1.URL(url.toString()); // prevent original url mutation
+        url.password = '[redacted]';
+    }
     let shortUrl = url.toString();
     if (opt.logWithSearchParams === false) {
         shortUrl = shortUrl.split('?')[0];

package/dist/stream/ndjson/pipelineFromNDJsonFile.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 import { NDJsonStats } from './ndjson.model';
 import { TransformJsonParseOptions } from './transformJsonParse';

package/dist/stream/ndjson/pipelineToNDJsonFile.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 import { NDJsonStats } from './ndjson.model';
 import { TransformToNDJsonOptions } from './transformToNDJson';

package/dist/stream/pipeline/pipeline.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable, Transform } from 'stream';
 import { DeferredPromise } from '@naturalcycles/js-lib';
 declare type AnyStream = NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream;

package/dist/util/zip.util.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ZlibOptions } from 'zlib';
 /**
  * deflateBuffer uses `deflate`.

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

@@ -29,7 +29,22 @@ export declare const SLUG_PATTERN: RegExp;
  * "Slug" - a valid URL, filename, etc.
  */
 export declare const slugSchema: import("./string.extensions").ExtendedStringSchema;
+/**
+ * Between years 1970 and 2050
+ */
 export declare const unixTimestampSchema: import("./number.extensions").ExtendedNumberSchema;
+/**
+ * Between years 2000 and 2050
+ */
+export declare const unixTimestamp2000Schema: import("./number.extensions").ExtendedNumberSchema;
+/**
+ * Between years 1970 and 2050
+ */
+export declare const unixTimestampMillisSchema: import("./number.extensions").ExtendedNumberSchema;
+/**
+ * Between years 2000 and 2050
+ */
+export declare const unixTimestampMillis2000Schema: import("./number.extensions").ExtendedNumberSchema;
 export declare const verSchema: import("./number.extensions").ExtendedNumberSchema;
 /**
  * Be careful, by default emailSchema does TLD validation. To disable it - use `stringSchema.email({tld: false}).lowercase()`

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_PATTERN = exports.emailSchema = exports.verSchema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_PATTERN = exports.idSchema = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
+exports.savedDBEntitySchema = exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_PATTERN = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_PATTERN = exports.idSchema = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchema = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
 const joi_extensions_1 = require("./joi.extensions");
 exports.booleanSchema = joi_extensions_1.Joi.boolean();
 exports.booleanDefaultToFalseSchema = joi_extensions_1.Joi.boolean().default(false);
@@ -40,8 +40,30 @@ exports.SLUG_PATTERN = /^[a-z0-9-]*$/;
  * "Slug" - a valid URL, filename, etc.
  */
 exports.slugSchema = exports.stringSchema.regex(/^[a-z0-9-]{1,255}$/);
-// 16725225600 is 2500-01-01
-exports.unixTimestampSchema = exports.numberSchema.integer().min(0).max(16725225600);
+const TS_2500 = 16725225600; // 2500-01-01
+const TS_2000 = 946684800; // 2000-01-01
+/**
+ * Between years 1970 and 2050
+ */
+exports.unixTimestampSchema = exports.numberSchema.integer().min(0).max(TS_2500);
+/**
+ * Between years 2000 and 2050
+ */
+exports.unixTimestamp2000Schema = exports.numberSchema.integer().min(0).min(TS_2000).max(TS_2500);
+/**
+ * Between years 1970 and 2050
+ */
+exports.unixTimestampMillisSchema = exports.numberSchema
+    .integer()
+    .min(0)
+    .max(TS_2500 * 1000);
+/**
+ * Between years 2000 and 2050
+ */
+exports.unixTimestampMillis2000Schema = exports.numberSchema
+    .integer()
+    .min(TS_2000 * 1000)
+    .max(TS_2500 * 1000);
 // 2
 exports.verSchema = exports.numberSchema.optional().integer().min(1).max(100);
 /**
@@ -64,11 +86,11 @@ exports.utcOffsetSchema = exports.numberSchema
 exports.ipAddressSchema = exports.stringSchema.ip();
 exports.baseDBEntitySchema = objectSchema({
     id: exports.stringSchema.optional(),
-    created: exports.unixTimestampSchema.optional(),
-    updated: exports.unixTimestampSchema.optional(),
+    created: exports.unixTimestamp2000Schema.optional(),
+    updated: exports.unixTimestamp2000Schema.optional(),
 });
 exports.savedDBEntitySchema = objectSchema({
     id: exports.stringSchema,
-    created: exports.unixTimestampSchema,
-    updated: exports.unixTimestampSchema,
+    created: exports.unixTimestamp2000Schema,
+    updated: exports.unixTimestamp2000Schema,
 });

package/package.json

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

package/src/bin/json2env.ts

@@ -19,6 +19,11 @@ runScript(() => {
       desc: 'Populate $BASH_ENV file if BASH_ENV env variable exists',
       default: true,
     },
+    githubEnv: {
+      type: 'boolean',
+      desc: 'Populate $GITHUB_ENV file if GITHUB_ENV env variable exists',
+      default: true,
+    },
     fail: {
       type: 'boolean',
       desc: 'Fail (exit status 1) on non-existing input file',
@@ -32,7 +37,7 @@ runScript(() => {
     },
   })
 
-  const { _: args, prefix, saveEnvFile, bashEnv, fail, debug, silent } = argv
+  const { _: args, prefix, saveEnvFile, bashEnv, githubEnv, fail, debug, silent } = argv
   if (debug) console.log({ argv })
 
   const jsonPath = args[0] as string
@@ -42,6 +47,7 @@ runScript(() => {
     prefix,
     saveEnvFile,
     bashEnv,
+    githubEnv,
     fail,
     debug,
     silent,

package/src/fs/json2env.ts

@@ -15,6 +15,11 @@ export interface Json2EnvOptions {
    */
   bashEnv?: boolean
 
+  /**
+   * @default true
+   */
+  githubEnv?: boolean
+
   /**
    * @default true
    */
@@ -27,11 +32,12 @@ export interface Json2EnvOptions {
 const JSON2ENV_OPT_DEF: Partial<Json2EnvOptions> = {
   saveEnvFile: true,
   bashEnv: true,
+  githubEnv: true,
   fail: true,
 }
 
 export function json2env(opt: Json2EnvOptions): void {
-  const { jsonPath, prefix, saveEnvFile, bashEnv, fail, debug, silent } = {
+  const { jsonPath, prefix, saveEnvFile, bashEnv, githubEnv, fail, debug, silent } = {
     ...JSON2ENV_OPT_DEF,
     ...opt,
   }
@@ -56,8 +62,10 @@ export function json2env(opt: Json2EnvOptions): void {
   const json = fs.readJsonSync(jsonPath)
 
   const exportStr = objectToShellExport(json, prefix)
+  const githubStr = objectToGithubActionsEnv(json, prefix)
+
   if (debug) {
-    console.log(json, exportStr)
+    console.log(json, exportStr, githubStr)
   }
 
   if (saveEnvFile) {
@@ -73,6 +81,10 @@ export function json2env(opt: Json2EnvOptions): void {
   if (bashEnv) {
     appendBashEnv(exportStr)
   }
+
+  if (githubEnv) {
+    appendGithubEnv(githubStr)
+  }
 }
 
 function appendBashEnv(exportStr: string): void {
@@ -84,6 +96,15 @@ function appendBashEnv(exportStr: string): void {
   }
 }
 
+function appendGithubEnv(exportStr: string): void {
+  const { GITHUB_ENV } = process.env
+  if (GITHUB_ENV) {
+    fs.appendFileSync(GITHUB_ENV, exportStr + '\n')
+
+    console.log(`GITHUB_ENV file appended (${dimGrey(GITHUB_ENV)})`)
+  }
+}
+
 /**
  * Turns Object with keys/values into a *.sh script that exports all keys as values.
  *
@@ -106,3 +127,26 @@ export function objectToShellExport(o: any, prefix = ''): string {
     .filter(Boolean)
     .join('\n')
 }
+
+/**
+ * Turns Object with keys/values into a file of key-value pairs
+ *
+ * @example
+ * { a: 'b', b: 'c'}
+ *
+ * will turn into:
+ *
+ * a=b
+ * b=c
+ */
+export function objectToGithubActionsEnv(o: any, prefix = ''): string {
+  return Object.keys(o)
+    .map(k => {
+      const v = o[k]
+      if (v) {
+        return `${prefix}${k}=${v}`
+      }
+    })
+    .filter(Boolean)
+    .join('\n')
+}

package/src/got/getGot.ts

@@ -207,9 +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 as statusCode is ${statusCode}, err.msg is ${err?.message}`,
-      )
+      // opt.logger!.log(
+      //   `skipping got.beforeRetry hook as statusCode is ${statusCode}, err.msg is ${err?.message}`,
+      // )
       return
     }
 
@@ -284,6 +284,11 @@ function gotAfterResponseHook(opt: GetGotOptions = {}): AfterResponseHook {
 }
 
 function getShortUrl(opt: GetGotOptions, url: URL, prefixUrl?: string): string {
+  if (url.password) {
+    url = new URL(url.toString()) // prevent original url mutation
+    url.password = '[redacted]'
+  }
+
   let shortUrl = url.toString()
 
   if (opt.logWithSearchParams === false) {

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

@@ -57,8 +57,31 @@ export const SLUG_PATTERN = /^[a-z0-9-]*$/
  */
 export const slugSchema = stringSchema.regex(/^[a-z0-9-]{1,255}$/)
 
-// 16725225600 is 2500-01-01
-export const unixTimestampSchema = numberSchema.integer().min(0).max(16725225600)
+const TS_2500 = 16725225600 // 2500-01-01
+const TS_2000 = 946684800 // 2000-01-01
+
+/**
+ * Between years 1970 and 2050
+ */
+export const unixTimestampSchema = numberSchema.integer().min(0).max(TS_2500)
+/**
+ * Between years 2000 and 2050
+ */
+export const unixTimestamp2000Schema = numberSchema.integer().min(0).min(TS_2000).max(TS_2500)
+/**
+ * Between years 1970 and 2050
+ */
+export const unixTimestampMillisSchema = numberSchema
+  .integer()
+  .min(0)
+  .max(TS_2500 * 1000)
+/**
+ * Between years 2000 and 2050
+ */
+export const unixTimestampMillis2000Schema = numberSchema
+  .integer()
+  .min(TS_2000 * 1000)
+  .max(TS_2500 * 1000)
 
 // 2
 export const verSchema = numberSchema.optional().integer().min(1).max(100)
@@ -88,12 +111,12 @@ export const ipAddressSchema = stringSchema.ip()
 
 export const baseDBEntitySchema = objectSchema<BaseDBEntity>({
   id: stringSchema.optional(),
-  created: unixTimestampSchema.optional(),
-  updated: unixTimestampSchema.optional(),
+  created: unixTimestamp2000Schema.optional(),
+  updated: unixTimestamp2000Schema.optional(),
 })
 
 export const savedDBEntitySchema = objectSchema<SavedDBEntity>({
   id: stringSchema,
-  created: unixTimestampSchema,
-  updated: unixTimestampSchema,
+  created: unixTimestamp2000Schema,
+  updated: unixTimestamp2000Schema,
 })