@naturalcycles/backend-lib 4.2.3 → 4.4.0

package/dist/admin/base.admin.service.d.ts

@@ -42,7 +42,7 @@ export declare class BaseAdminService {
      * Override if needed.
      */
     getAdminToken(req: BackendRequest): Promise<string | undefined>;
-    isAdmin(req: BackendRequest): Promise<boolean>;
+    isAdmin(req: BackendRequest | undefined): Promise<boolean>;
     getAdminInfo(req: BackendRequest): Promise<AdminInfo | undefined>;
     /**
      * Returns AdminInfo if it has all required permissions.

package/dist/admin/base.admin.service.js

@@ -75,6 +75,8 @@ class BaseAdminService {
             req.header('x-admin-token'));
     }
     async isAdmin(req) {
+        if (!req)
+            return false;
         const adminToken = await this.getAdminToken(req);
         const email = await this.getEmailByToken(req, adminToken);
         return !!this.getEmailPermissions(email);

package/dist/admin/firebase.shared.service.js

@@ -26,7 +26,7 @@ class FirebaseSharedService {
         return this.admin().auth();
     }
 }
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], FirebaseSharedService.prototype, "admin", null);
 exports.FirebaseSharedService = FirebaseSharedService;

package/dist/deploy/deploy.util.js

@@ -4,7 +4,6 @@ exports.validateGAEServiceName = exports.createAppYaml = exports.createAndSaveAp
 const fs = require("fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const time_lib_1 = require("@naturalcycles/time-lib");
 const yaml = require("js-yaml");
 const APP_YAML_DEFAULT = () => ({
     runtime: 'nodejs16',
@@ -35,7 +34,7 @@ exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
 async function createDeployInfo(backendCfg) {
     const simpleGit = require('simple-git/promise'); // lazy load
     const git = simpleGit('.');
-    const now = time_lib_1.dayjs.utc();
+    const now = (0, js_lib_1.localTime)();
     const gitBranch = (await git.status()).current;
     const gitRev = (await git.revparse(['HEAD'])).slice(0, 7);
     let { gaeProject, gaeProjectByBranch = {}, gaeService, gaeServiceByBranch = {}, serviceWithBranchName, prodBranch, branchesWithTimestampVersions = [], } = backendCfg;
@@ -49,7 +48,8 @@ async function createDeployInfo(backendCfg) {
     if (branchesWithTimestampVersions.includes(gitBranch)) {
         // May only contain lowercase letters, digits, and hyphens. Must begin and end with a letter or digit. Must not exceed 63 characters.
         gaeVersion = [
-            now.format('YYYYMMDD-HHmm'),
+            // now.format('YYYYMMDD-HHmm'), // 20190521-1721
+            now.toStringCompact().replace('_', '-'),
             gitRev,
         ].join('-');
     }

package/dist/index.js

@@ -15,23 +15,23 @@ const secureHeaderMiddleware_1 = require("./admin/secureHeaderMiddleware");
 Object.defineProperty(exports, "createSecureHeaderMiddleware", { enumerable: true, get: function () { return secureHeaderMiddleware_1.createSecureHeaderMiddleware; } });
 const env_shared_service_1 = require("./env/env.shared.service");
 Object.defineProperty(exports, "EnvSharedService", { enumerable: true, get: function () { return env_shared_service_1.EnvSharedService; } });
-(0, tslib_1.__exportStar)(require("./gae/appEngine.util"), exports);
+tslib_1.__exportStar(require("./gae/appEngine.util"), exports);
 const sentry_shared_service_1 = require("./sentry/sentry.shared.service");
 Object.defineProperty(exports, "SentrySharedService", { enumerable: true, get: function () { return sentry_shared_service_1.SentrySharedService; } });
-(0, tslib_1.__exportStar)(require("./server/catchWrapper"), exports);
-(0, tslib_1.__exportStar)(require("./server/createDefaultApp"), exports);
-(0, tslib_1.__exportStar)(require("./server/deployInfo.util"), exports);
-(0, tslib_1.__exportStar)(require("./server/getDefaultRouter"), exports);
+tslib_1.__exportStar(require("./server/catchWrapper"), exports);
+tslib_1.__exportStar(require("./server/createDefaultApp"), exports);
+tslib_1.__exportStar(require("./server/deployInfo.util"), exports);
+tslib_1.__exportStar(require("./server/getDefaultRouter"), exports);
 const bodyParserTimeoutMiddleware_1 = require("./server/bodyParserTimeoutMiddleware");
 Object.defineProperty(exports, "bodyParserTimeoutMiddleware", { enumerable: true, get: function () { return bodyParserTimeoutMiddleware_1.bodyParserTimeoutMiddleware; } });
 Object.defineProperty(exports, "clearBodyParserTimeout", { enumerable: true, get: function () { return bodyParserTimeoutMiddleware_1.clearBodyParserTimeout; } });
-(0, tslib_1.__exportStar)(require("./server/genericErrorMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/serverStatsMiddleware"), exports);
+tslib_1.__exportStar(require("./server/genericErrorMiddleware"), exports);
+tslib_1.__exportStar(require("./server/serverStatsMiddleware"), exports);
 const methodOverrideMiddleware_1 = require("./server/methodOverrideMiddleware");
 Object.defineProperty(exports, "methodOverrideMiddleware", { enumerable: true, get: function () { return methodOverrideMiddleware_1.methodOverrideMiddleware; } });
-(0, tslib_1.__exportStar)(require("./server/notFoundMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/okMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/requestTimeoutMiddleware"), exports);
+tslib_1.__exportStar(require("./server/notFoundMiddleware"), exports);
+tslib_1.__exportStar(require("./server/okMiddleware"), exports);
+tslib_1.__exportStar(require("./server/requestTimeoutMiddleware"), exports);
 const reqValidationMiddleware_1 = require("./server/reqValidationMiddleware");
 Object.defineProperty(exports, "reqValidation", { enumerable: true, get: function () { return reqValidationMiddleware_1.reqValidation; } });
 const simpleRequestLoggerMiddleware_1 = require("./server/simpleRequestLoggerMiddleware");
@@ -39,12 +39,12 @@ Object.defineProperty(exports, "simpleRequestLoggerMiddleware", { enumerable: tr
 const serverStatusMiddleware_1 = require("./server/serverStatusMiddleware");
 Object.defineProperty(exports, "serverStatusMiddleware", { enumerable: true, get: function () { return serverStatusMiddleware_1.serverStatusMiddleware; } });
 Object.defineProperty(exports, "getServerStatusData", { enumerable: true, get: function () { return serverStatusMiddleware_1.getServerStatusData; } });
-(0, tslib_1.__exportStar)(require("./server/validateMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/request.log.util"), exports);
+tslib_1.__exportStar(require("./server/validateMiddleware"), exports);
+tslib_1.__exportStar(require("./server/request.log.util"), exports);
 const startServer_1 = require("./server/startServer");
 Object.defineProperty(exports, "BackendServer", { enumerable: true, get: function () { return startServer_1.BackendServer; } });
 Object.defineProperty(exports, "startServer", { enumerable: true, get: function () { return startServer_1.startServer; } });
-(0, tslib_1.__exportStar)(require("./server/asyncLocalStorageMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/appEngineLogMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/safeJsonMiddleware"), exports);
-(0, tslib_1.__exportStar)(require("./server/request.util"), exports);
+tslib_1.__exportStar(require("./server/asyncLocalStorageMiddleware"), exports);
+tslib_1.__exportStar(require("./server/appEngineLogMiddleware"), exports);
+tslib_1.__exportStar(require("./server/safeJsonMiddleware"), exports);
+tslib_1.__exportStar(require("./server/request.util"), exports);

package/dist/sentry/sentry.shared.service.js

@@ -126,7 +126,7 @@ class SentrySharedService {
         };
     }
 }
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], SentrySharedService.prototype, "sentry", null);
 exports.SentrySharedService = SentrySharedService;

package/dist/server/serverStatusMiddleware.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServerStatusData = exports.serverStatusMiddleware = void 0;
 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 { versions } = process;
 const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV } = process.env;
@@ -15,11 +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 deployBuildTimeUTC = time_lib_1.dayjs.unix(ts).toPretty();
-    const buildInfo = [time_lib_1.dayjs.unix(ts).toCompactTime(), gitBranch, gitRev].filter(Boolean).join('_');
+    const t = (0, js_lib_1.localTime)(ts);
+    const deployBuildTime = t.toPretty();
+    const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_');
     return (0, js_lib_1._filterFalsyValues)({
         started: getStartedStr(),
-        deployBuildTimeUTC,
+        deployBuildTime,
         APP_ENV,
         prod,
         buildInfo,
@@ -35,8 +35,8 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
 }
 exports.getServerStatusData = getServerStatusData;
 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})`;
+    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)`;
 }

package/dist/server/startServer.js

@@ -78,7 +78,7 @@ class BackendServer {
         }
     }
 }
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], BackendServer.prototype, "stop", null);
 exports.BackendServer = BackendServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.2.3",
+  "version": "4.4.0",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",
@@ -19,14 +19,13 @@
     "@naturalcycles/db-lib": "^8.0.2",
     "@naturalcycles/js-lib": "^14.27.0",
     "@naturalcycles/nodejs-lib": "^12.0.0",
-    "@naturalcycles/time-lib": "^3.0.1",
     "@types/cookie-parser": "^1.4.1",
     "@types/cors": "^2.8.4",
     "@types/express": "^4.16.1",
     "@types/on-finished": "^2.3.1",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.5",
-    "dotenv": "^14.2.0",
+    "dotenv": "^16.0.0",
     "ejs": "^3.0.1",
     "express": "^4.16.4",
     "express-promise-router": "^4.0.0",

package/src/admin/base.admin.service.ts

@@ -119,7 +119,8 @@ export class BaseAdminService {
     )
   }
 
-  async isAdmin(req: BackendRequest): Promise<boolean> {
+  async isAdmin(req: BackendRequest | undefined): Promise<boolean> {
+    if (!req) return false
     const adminToken = await this.getAdminToken(req)
     const email = await this.getEmailByToken(req, adminToken)
     return !!this.getEmailPermissions(email)

package/src/deploy/deploy.util.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs'
-import { _mapValues, _merge, _truncate } from '@naturalcycles/js-lib'
+import { _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib'
 import { dimGrey, white } from '@naturalcycles/nodejs-lib/dist/colors'
-import { dayjs } from '@naturalcycles/time-lib'
 import * as yaml from 'js-yaml'
 import type * as simpleGitLib from 'simple-git/promise'
 import { BackendCfg } from './backend.cfg.util'
@@ -44,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 = dayjs.utc()
+  const now = localTime()
   const gitBranch = (await git.status()).current!
   const gitRev = (await git.revparse(['HEAD'])).slice(0, 7)
 
@@ -73,7 +72,8 @@ export async function createDeployInfo(backendCfg: BackendCfg): Promise<DeployIn
   if (branchesWithTimestampVersions.includes(gitBranch)) {
     // May only contain lowercase letters, digits, and hyphens. Must begin and end with a letter or digit. Must not exceed 63 characters.
     gaeVersion = [
-      now.format('YYYYMMDD-HHmm'), // 20190521-1721
+      // now.format('YYYYMMDD-HHmm'), // 20190521-1721
+      now.toStringCompact().replace('_', '-'),
       gitRev,
     ].join('-')
   }

package/src/server/serverStatusMiddleware.ts

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