@naturalcycles/nodejs-lib 13.39.2 → 13.41.0

package/dist/script/runScript.d.ts

@@ -10,6 +10,11 @@ export interface RunScriptOptions {
      * Default to `console`
      */
     logger?: CommonLogger;
+    /**
+     * Defaults to true.
+     * Set to false if you already have your handlers elsewhere and don't need them here.
+     */
+    registerUncaughtExceptionHandlers?: boolean;
 }
 /**
  * Use it in your top-level scripts like this:

package/dist/script/runScript.js

@@ -24,13 +24,15 @@ const { DEBUG_RUN_SCRIPT } = process.env;
  */
 function runScript(fn, opt = {}) {
     (0, js_lib_1.setGlobalStringifyFunction)(inspect_1.inspectStringifyFn);
-    const { logger = console, noExit } = opt;
-    process.on('uncaughtException', err => {
-        logger.error('uncaughtException:', err);
-    });
-    process.on('unhandledRejection', err => {
-        logger.error('unhandledRejection:', err);
-    });
+    const { logger = console, noExit, registerUncaughtExceptionHandlers = true } = opt;
+    if (registerUncaughtExceptionHandlers || DEBUG_RUN_SCRIPT) {
+        process.on('uncaughtException', err => {
+            logger.error('runScript uncaughtException:', err);
+        });
+        process.on('unhandledRejection', err => {
+            logger.error('runScript unhandledRejection:', err);
+        });
+    }
     if (DEBUG_RUN_SCRIPT) {
         process.on('exit', code => logger.log(`process.exit event, code=${code}`));
         process.on('beforeExit', code => logger.log(`process.beforeExit event, code=${code}`));

package/dist/util/buildInfo.util.d.ts

@@ -4,5 +4,9 @@ export interface GenerateBuildInfoOptions {
      * If set - this timestamp will be used, instead of "current time".
      */
     overrideTimestamp?: UnixTimestamp;
+    /**
+     * Defaults to currently checked out git branch.
+     */
+    overrideBranchName?: string;
 }
 export declare function generateBuildInfo(opt?: GenerateBuildInfoOptions): BuildInfo;

package/dist/util/buildInfo.util.js

@@ -8,7 +8,7 @@ function generateBuildInfo(opt = {}) {
     const now = js_lib_1.localTime.orNow(opt.overrideTimestamp);
     const ts = now.unix;
     const rev = git2_1.git2.getCurrentCommitSha();
-    const branchName = git2_1.git2.getCurrentBranchName();
+    const branchName = opt.overrideBranchName || git2_1.git2.getCurrentBranchName();
     const repoName = git2_1.git2.getCurrentRepoName();
     const tsCommit = git2_1.git2.getCurrentCommitTimestamp();
     const ver = [now.toStringCompact(), repoName, branchName, rev].join('_');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.39.2",
+  "version": "13.41.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/script/runScript.ts

@@ -14,6 +14,12 @@ export interface RunScriptOptions {
    * Default to `console`
    */
   logger?: CommonLogger
+
+  /**
+   * Defaults to true.
+   * Set to false if you already have your handlers elsewhere and don't need them here.
+   */
+  registerUncaughtExceptionHandlers?: boolean
 }
 
 const { DEBUG_RUN_SCRIPT } = process.env
@@ -39,14 +45,16 @@ const { DEBUG_RUN_SCRIPT } = process.env
 export function runScript(fn: (...args: any[]) => any, opt: RunScriptOptions = {}): void {
   setGlobalStringifyFunction(inspectStringifyFn)
 
-  const { logger = console, noExit } = opt
+  const { logger = console, noExit, registerUncaughtExceptionHandlers = true } = opt
 
-  process.on('uncaughtException', err => {
-    logger.error('uncaughtException:', err)
-  })
-  process.on('unhandledRejection', err => {
-    logger.error('unhandledRejection:', err)
-  })
+  if (registerUncaughtExceptionHandlers || DEBUG_RUN_SCRIPT) {
+    process.on('uncaughtException', err => {
+      logger.error('runScript uncaughtException:', err)
+    })
+    process.on('unhandledRejection', err => {
+      logger.error('runScript unhandledRejection:', err)
+    })
+  }
 
   if (DEBUG_RUN_SCRIPT) {
     process.on('exit', code => logger.log(`process.exit event, code=${code}`))

package/src/util/buildInfo.util.ts

@@ -13,6 +13,11 @@ export interface GenerateBuildInfoOptions {
    * If set - this timestamp will be used, instead of "current time".
    */
   overrideTimestamp?: UnixTimestamp
+
+  /**
+   * Defaults to currently checked out git branch.
+   */
+  overrideBranchName?: string
 }
 
 export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo {
@@ -20,7 +25,7 @@ export function generateBuildInfo(opt: GenerateBuildInfoOptions = {}): BuildInfo
   const ts = now.unix
 
   const rev = git2.getCurrentCommitSha()
-  const branchName = git2.getCurrentBranchName()
+  const branchName = opt.overrideBranchName || git2.getCurrentBranchName()
   const repoName = git2.getCurrentRepoName()
   const tsCommit = git2.getCurrentCommitTimestamp()