@naturalcycles/backend-lib 2.60.3 → 2.60.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.60.4](https://github.com/NaturalCycles/backend-lib/compare/v2.60.3...v2.60.4) (2021-10-21)
+
+
+### Bug Fixes
+
+* deps, use process.uptime in statusHandler ([8d3389d](https://github.com/NaturalCycles/backend-lib/commit/8d3389d8908954af9a375a6d7fb95aefc1b08e5f))
+
 ## [2.60.3](https://github.com/NaturalCycles/backend-lib/compare/v2.60.2...v2.60.3) (2021-10-15)
 
 

package/dist/db/httpDB.d.ts

@@ -1,5 +1,5 @@
-import { JsonSchemaRootObject } from '@naturalcycles/js-lib';
-import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, ObjectWithId, RunQueryResult } from '@naturalcycles/db-lib';
+import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
 import { GetGotOptions, ReadableTyped } from '@naturalcycles/nodejs-lib';
 export interface HttpDBCfg extends GetGotOptions {
     prefixUrl: string;

package/dist/db/httpDBRequestHandler.d.ts

@@ -1,4 +1,5 @@
-import { CommonDB, CommonDBOptions, CommonDBSaveOptions, DBQuery, ObjectWithId } from '@naturalcycles/db-lib';
+import { CommonDB, CommonDBOptions, CommonDBSaveOptions, DBQuery } from '@naturalcycles/db-lib';
+import { ObjectWithId } from '@naturalcycles/js-lib';
 import { Router } from 'express';
 export interface GetByIdsInput {
     table: string;

package/dist/index.d.ts

@@ -32,13 +32,3 @@ import { BackendServer, startServer } from './server/startServer';
 import { StartServerCfg, StartServerData } from './server/startServer.model';
 export type { MethodOverrideCfg, SentrySharedServiceCfg, RequestHandlerWithPath, RequestHandlerCfg, DefaultAppCfg, StartServerCfg, StartServerData, EnvSharedServiceCfg, BaseEnv, AdminMiddleware, AdminServiceCfg, AdminInfo, RequireAdminCfg, SecureHeaderMiddlewareCfg, BodyParserTimeoutCfg, RequestTimeoutCfg, SimpleRequestLoggerCfg, ReqValidationOptions, };
 export { BackendServer, SentrySharedService, EnvSharedService, reqValidation, notFoundHandler, genericErrorHandler, methodOverride, sentryErrorHandler, createDefaultApp, startServer, catchWrapper, getDefaultRouter, isGAE, statusHandler, statusHandlerData, okHandler, getDeployInfo, onFinished, respondWithError, logRequest, FirebaseSharedService, createAdminMiddleware, BaseAdminService, loginHtml, createSecureHeaderMiddleware, bodyParserTimeout, clearBodyParserTimeout, requestTimeout, simpleRequestLogger, coloredHttpCode, getRequestContextProperty, setRequestContextProperty, requestContextMiddleware, requestIdMiddleware, REQUEST_ID_KEY, validateBody, validateParams, validateQuery, };
-declare global {
-    namespace NodeJS {
-        interface ProcessEnv {
-            PORT?: string;
-            GAE_APPLICATION?: string;
-            GAE_SERVICE?: string;
-            GAE_VERSION?: string;
-        }
-    }
-}

package/dist/server/handlers/reqValidation.mw.js

@@ -11,6 +11,7 @@ function reqValidation(reqProperty, schema, opt = {}) {
             if (opt.redactPaths) {
                 redact(opt.redactPaths, req[reqProperty], error);
                 error.data.joiValidationErrorItems.length = 0; // clears the array
+                delete error.data.annotation;
             }
             return next(new js_lib_1.HttpError(error.message, {
                 httpStatusCode: 400,

package/dist/server/handlers/statusHandler.d.ts

@@ -1,8 +1,3 @@
 import { RequestHandler } from 'express';
-/**
- * @returns unix timestamp in millis
- */
-declare type ServerStartedCallback = () => number | undefined;
-export declare function statusHandler(serverStartedCallback?: ServerStartedCallback, projectDir?: string, extra?: any): RequestHandler;
-export declare function statusHandlerData(serverStartedCallback?: ServerStartedCallback, projectDir?: string, extra?: any): Record<string, any>;
-export {};
+export declare function statusHandler(projectDir?: string, extra?: any): RequestHandler;
+export declare function statusHandlerData(projectDir?: string, extra?: any): Record<string, any>;

package/dist/server/handlers/statusHandler.js

@@ -5,29 +5,28 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const time_lib_1 = require("@naturalcycles/time-lib");
 const deployInfo_util_1 = require("../deployInfo.util");
-const now = Date.now();
-const defaultServerStartedCallback = () => now;
 const { versions } = process;
-function statusHandler(serverStartedCallback, projectDir, extra) {
+const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION } = process.env;
+function statusHandler(projectDir, extra) {
     return async (req, res) => {
-        res.json(statusHandlerData(serverStartedCallback, projectDir, extra));
+        res.json(statusHandlerData(projectDir, extra));
     };
 }
 exports.statusHandler = statusHandler;
-function statusHandlerData(serverStartedCallback = defaultServerStartedCallback, projectDir = process.cwd(), extra) {
+function statusHandlerData(projectDir = process.cwd(), extra) {
     const { APP_ENV } = process.env;
     const { gitRev, gitBranch, prod, ts } = (0, deployInfo_util_1.getDeployInfo)(projectDir);
     const deployBuildTimeUTC = time_lib_1.dayjs.unix(ts).toPretty();
     const buildInfo = [time_lib_1.dayjs.unix(ts).toCompactTime(), gitBranch, gitRev].filter(Boolean).join('_');
     return (0, js_lib_1._filterFalsyValues)({
-        started: getStartedStr(serverStartedCallback()),
+        started: getStartedStr(),
         deployBuildTimeUTC,
         APP_ENV,
         prod,
         buildInfo,
-        GAE_APPLICATION: process.env.GAE_APPLICATION,
-        GAE_SERVICE: process.env.GAE_SERVICE,
-        GAE_VERSION: process.env.GAE_VERSION,
+        GAE_APPLICATION,
+        GAE_SERVICE,
+        GAE_VERSION,
         mem: (0, nodejs_lib_1.memoryUsageFull)(),
         cpuAvg: nodejs_lib_1.processSharedUtil.cpuAvg(),
         // resourceUsage: process.resourceUsage?.(),
@@ -36,9 +35,8 @@ function statusHandlerData(serverStartedCallback = defaultServerStartedCallback,
     });
 }
 exports.statusHandlerData = statusHandlerData;
-function getStartedStr(serverStarted) {
-    if (!serverStarted)
-        return 'not started yet';
+function getStartedStr() {
+    const serverStarted = time_lib_1.dayjs.utc().subtract(process.uptime(), 's');
     const s1 = (0, time_lib_1.dayjs)(serverStarted).toPretty();
     const s2 = (0, time_lib_1.dayjs)(serverStarted).fromNow();
     return `${s1} UTC (${s2})`;

package/dist/server/startServer.js

@@ -22,7 +22,7 @@ class BackendServer {
         process.once('SIGTERM', () => this.stop());
         // sentryService.install()
         // 2. Start Express Server
-        const port = Number(process.env.PORT) || cfgPort || 8080;
+        const port = Number(process.env['PORT']) || cfgPort || 8080;
         this.server = await new Promise((resolve, reject) => {
             const server = expressApp.listen(port, (err) => {
                 if (err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "2.60.3",
+  "version": "2.60.4",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",

package/src/db/httpDB.ts

@@ -1,5 +1,5 @@
 import { Readable } from 'stream'
-import { JsonSchemaRootObject } from '@naturalcycles/js-lib'
+import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
 import {
   BaseCommonDB,
   CommonDB,
@@ -7,7 +7,6 @@ import {
   CommonDBSaveOptions,
   CommonDBStreamOptions,
   DBQuery,
-  ObjectWithId,
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import { getGot, GetGotOptions, Got, ReadableTyped } from '@naturalcycles/nodejs-lib'

package/src/db/httpDBRequestHandler.ts

@@ -4,13 +4,13 @@ import {
   CommonDBSaveOptions,
   DBQuery,
   InMemoryDB,
-  ObjectWithId,
 } from '@naturalcycles/db-lib'
 import {
   commonDBOptionsSchema,
   commonDBSaveOptionsSchema,
   dbQuerySchema,
 } from '@naturalcycles/db-lib/dist/validation'
+import { ObjectWithId } from '@naturalcycles/js-lib'
 import { anyObjectSchema, arraySchema, objectSchema, stringSchema } from '@naturalcycles/nodejs-lib'
 import { Router } from 'express'
 import { getDefaultRouter, reqValidation } from '..'

package/src/index.ts

@@ -112,14 +112,3 @@ export {
   validateParams,
   validateQuery,
 }
-
-declare global {
-  namespace NodeJS {
-    interface ProcessEnv {
-      PORT?: string
-      GAE_APPLICATION?: string
-      GAE_SERVICE?: string
-      GAE_VERSION?: string
-    }
-  }
-}

package/src/server/handlers/reqValidation.mw.ts

@@ -23,6 +23,7 @@ export function reqValidation(
       if (opt.redactPaths) {
         redact(opt.redactPaths, req[reqProperty], error)
         error.data.joiValidationErrorItems.length = 0 // clears the array
+        delete error.data.annotation
       }
 
       return next(

package/src/server/handlers/statusHandler.ts

@@ -4,27 +4,16 @@ import { dayjs } from '@naturalcycles/time-lib'
 import { RequestHandler } from 'express'
 import { getDeployInfo } from '../deployInfo.util'
 
-/**
- * @returns unix timestamp in millis
- */
-type ServerStartedCallback = () => number | undefined
-
-const now = Date.now()
-const defaultServerStartedCallback = () => now
 const { versions } = process
+const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION } = process.env
 
-export function statusHandler(
-  serverStartedCallback?: ServerStartedCallback,
-  projectDir?: string,
-  extra?: any,
-): RequestHandler {
+export function statusHandler(projectDir?: string, extra?: any): RequestHandler {
   return async (req, res) => {
-    res.json(statusHandlerData(serverStartedCallback, projectDir, extra))
+    res.json(statusHandlerData(projectDir, extra))
   }
 }
 
 export function statusHandlerData(
-  serverStartedCallback: ServerStartedCallback = defaultServerStartedCallback,
   projectDir: string = process.cwd(),
   extra?: any,
 ): Record<string, any> {
@@ -34,14 +23,14 @@ export function statusHandlerData(
   const buildInfo = [dayjs.unix(ts).toCompactTime(), gitBranch, gitRev].filter(Boolean).join('_')
 
   return _filterFalsyValues({
-    started: getStartedStr(serverStartedCallback()),
+    started: getStartedStr(),
     deployBuildTimeUTC,
     APP_ENV,
     prod,
     buildInfo,
-    GAE_APPLICATION: process.env.GAE_APPLICATION,
-    GAE_SERVICE: process.env.GAE_SERVICE,
-    GAE_VERSION: process.env.GAE_VERSION,
+    GAE_APPLICATION,
+    GAE_SERVICE,
+    GAE_VERSION,
     mem: memoryUsageFull(),
     cpuAvg: processSharedUtil.cpuAvg(),
     // resourceUsage: process.resourceUsage?.(),
@@ -50,8 +39,8 @@ export function statusHandlerData(
   })
 }
 
-function getStartedStr(serverStarted?: number): string {
-  if (!serverStarted) return 'not started yet'
+function getStartedStr(): string {
+  const serverStarted = dayjs.utc().subtract(process.uptime(), 's')
 
   const s1 = dayjs(serverStarted).toPretty()
   const s2 = dayjs(serverStarted).fromNow()

package/src/server/startServer.ts

@@ -27,7 +27,7 @@ export class BackendServer {
     // sentryService.install()
 
     // 2. Start Express Server
-    const port = Number(process.env.PORT) || cfgPort || 8080
+    const port = Number(process.env['PORT']) || cfgPort || 8080
 
     this.server = await new Promise<Server>((resolve, reject) => {
       const server = expressApp.listen(port, (err?: Error) => {