@naturalcycles/backend-lib 4.4.0 → 4.4.1

package/dist/deploy/deploy.util.js

@@ -34,7 +34,7 @@ exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
 async function createDeployInfo(backendCfg) {
     const simpleGit = require('simple-git/promise'); // lazy load
     const git = simpleGit('.');
-    const now = (0, js_lib_1.localTime)();
+    const now = (0, js_lib_1.localTime)().utc();
     const gitBranch = (await git.status()).current;
     const gitRev = (await git.revparse(['HEAD'])).slice(0, 7);
     let { gaeProject, gaeProjectByBranch = {}, gaeService, gaeServiceByBranch = {}, serviceWithBranchName, prodBranch, branchesWithTimestampVersions = [], } = backendCfg;

package/dist/server/serverStatusMiddleware.js

@@ -14,12 +14,12 @@ function serverStatusMiddleware(projectDir, extra) {
 exports.serverStatusMiddleware = serverStatusMiddleware;
 function getServerStatusData(projectDir = process.cwd(), extra) {
     const { gitRev, gitBranch, prod, ts } = (0, deployInfo_util_1.getDeployInfo)(projectDir);
-    const t = (0, js_lib_1.localTime)(ts);
-    const deployBuildTime = t.toPretty();
+    const t = (0, js_lib_1.localTime)(ts).utc();
+    const deployBuildTimeUTC = t.toPretty();
     const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_');
     return (0, js_lib_1._filterFalsyValues)({
         started: getStartedStr(),
-        deployBuildTime,
+        deployBuildTimeUTC,
         APP_ENV,
         prod,
         buildInfo,
@@ -35,8 +35,6 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
 }
 exports.getServerStatusData = getServerStatusData;
 function getStartedStr() {
-    const serverStarted = (0, js_lib_1.localTime)().subtract(process.uptime(), 'second');
-    const s1 = serverStarted.toPretty();
-    const s2 = (0, js_lib_1._ms)(Date.now() - serverStarted.unix() * 1000);
-    return `${s1} (${s2} ago)`;
+    const started = (0, js_lib_1.localTime)().utc().subtract(process.uptime(), 'second');
+    return `${started.toPretty()} UTC (${started.fromNow()})`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",

package/src/deploy/deploy.util.ts

@@ -43,7 +43,7 @@ export async function createDeployInfo(backendCfg: BackendCfg): Promise<DeployIn
   const simpleGit = require('simple-git/promise') as typeof simpleGitLib // lazy load
   const git = simpleGit('.')
 
-  const now = localTime()
+  const now = localTime().utc()
   const gitBranch = (await git.status()).current!
   const gitRev = (await git.revparse(['HEAD'])).slice(0, 7)
 

package/src/server/serverStatusMiddleware.ts

@@ -1,4 +1,4 @@
-import { _filterFalsyValues, _ms, localTime } from '@naturalcycles/js-lib'
+import { _filterFalsyValues, localTime } from '@naturalcycles/js-lib'
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib'
 import { getDeployInfo } from './deployInfo.util'
 import { BackendRequestHandler } from './server.model'
@@ -17,13 +17,13 @@ export function getServerStatusData(
   extra?: any,
 ): Record<string, any> {
   const { gitRev, gitBranch, prod, ts } = getDeployInfo(projectDir)
-  const t = localTime(ts)
-  const deployBuildTime = t.toPretty()
+  const t = localTime(ts).utc()
+  const deployBuildTimeUTC = t.toPretty()
   const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_')
 
   return _filterFalsyValues({
     started: getStartedStr(),
-    deployBuildTime,
+    deployBuildTimeUTC,
     APP_ENV,
     prod,
     buildInfo,
@@ -39,9 +39,6 @@ export function getServerStatusData(
 }
 
 function getStartedStr(): string {
-  const serverStarted = localTime().subtract(process.uptime(), 'second')
-
-  const s1 = serverStarted.toPretty()
-  const s2 = _ms(Date.now() - serverStarted.unix() * 1000)
-  return `${s1} (${s2} ago)`
+  const started = localTime().utc().subtract(process.uptime(), 'second')
+  return `${started.toPretty()} UTC (${started.fromNow()})`
 }