@naturalcycles/backend-lib 4.9.0 → 4.10.0

package/dist/admin/secureHeaderMiddleware.js

@@ -29,6 +29,6 @@ function requireSecureHeaderOrAdmin(cfg, reqPermissions) {
             }));
         }
         // Forward to AdminMiddleware (try Admin)
-        requireAdmin(req, res, next);
+        await requireAdmin(req, res, next);
     };
 }

package/dist/server/genericErrorMiddleware.js

@@ -15,7 +15,7 @@ let formatError;
  * Sends json payload as ErrorResponse, transformed via errorSharedUtil.
  */
 function genericErrorMiddleware(cfg = {}) {
-    sentryService || (sentryService = cfg.sentryService);
+    sentryService ||= cfg.sentryService;
     reportOnly5xx = cfg.reportOnly5xx || false;
     formatError = cfg.formatError;
     return (err, req, res, _next) => {
@@ -35,7 +35,6 @@ function genericErrorMiddleware(cfg = {}) {
 }
 exports.genericErrorMiddleware = genericErrorMiddleware;
 function respondWithError(req, res, err) {
-    var _a, _b;
     const { headersSent } = res;
     if (headersSent) {
         req.error(`after headersSent`, err);
@@ -54,9 +53,9 @@ function respondWithError(req, res, err) {
         return;
     const httpError = (0, js_lib_1._errorToErrorObject)(originalError, includeErrorStack);
     httpError.data.errorId = errorId;
-    (_a = httpError.data).httpStatusCode || (_a.httpStatusCode = 500); // default to 500
+    httpError.data.httpStatusCode ||= 500; // default to 500
     httpError.data.headersSent = headersSent || undefined;
-    (_b = httpError.data).report || (_b.report = undefined); // set to undefined if false
+    httpError.data.report ||= undefined; // set to undefined if false
     (0, js_lib_1._filterUndefinedValues)(httpError.data, true);
     formatError?.(httpError); // Mutates
     res.status(httpError.data.httpStatusCode).json({

package/dist/server/server.model.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { CommonLogFunction } from '@naturalcycles/js-lib';
-import { IRouter, Request, NextFunction, Response, Application } from 'express';
+import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib';
+import type { IRouter, Request, NextFunction, Response, Application } from 'express';
 /**
  * Use this interface instead of express.Request in cases when TypeScript gives an error, because it haven't "included" this very file.
  *
@@ -21,8 +21,8 @@ export interface BackendRequest extends Request {
     bodyParserTimeout?: NodeJS.Timeout;
 }
 export type BackendResponse = Response;
-export type BackendRequestHandler = (req: BackendRequest, res: BackendResponse, next: NextFunction) => void;
-export type BackendErrorRequestHandler = (err: any, req: BackendRequest, res: BackendResponse, next: NextFunction) => void;
+export type BackendRequestHandler = (req: BackendRequest, res: BackendResponse, next: NextFunction) => Promisable<void>;
+export type BackendErrorRequestHandler = (err: any, req: BackendRequest, res: BackendResponse, next: NextFunction) => Promisable<void>;
 export type BackendRouter = IRouter;
 export type BackendApplication = Application;
 declare module 'http' {

package/dist/server/serverStatsMiddleware.js

@@ -78,12 +78,12 @@ function serverStatsMiddleware() {
             const now = Date.now();
             const latency = now - started;
             const endpoint = (0, request_util_1.getRequestEndpoint)(req);
-            serverStatsMap[endpoint] || (serverStatsMap[endpoint] = {
+            serverStatsMap[endpoint] ||= {
                 stack: new js_lib_1.NumberStack(SIZE),
                 '2xx': 0,
                 '4xx': 0,
                 '5xx': 0,
-            });
+            };
             serverStatsMap[endpoint].stack.push(latency);
             if (res.statusCode) {
                 serverStatsMap[endpoint][getStatusFamily(res.statusCode)]++;

package/package.json

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

package/src/admin/secureHeaderMiddleware.ts

@@ -52,6 +52,6 @@ function requireSecureHeaderOrAdmin(
     }
 
     // Forward to AdminMiddleware (try Admin)
-    requireAdmin(req, res, next)
+    await requireAdmin(req, res, next)
   }
 }

package/src/server/server.model.ts

@@ -1,5 +1,5 @@
-import { CommonLogFunction } from '@naturalcycles/js-lib'
-import { IRouter, Request, NextFunction, Response, Application } from 'express'
+import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib'
+import type { IRouter, Request, NextFunction, Response, Application } from 'express'
 
 /**
  * Use this interface instead of express.Request in cases when TypeScript gives an error, because it haven't "included" this very file.
@@ -30,14 +30,14 @@ export type BackendRequestHandler = (
   req: BackendRequest,
   res: BackendResponse,
   next: NextFunction,
-) => void
+) => Promisable<void>
 
 export type BackendErrorRequestHandler = (
   err: any,
   req: BackendRequest,
   res: BackendResponse,
   next: NextFunction,
-) => void
+) => Promisable<void>
 
 export type BackendRouter = IRouter
 export type BackendApplication = Application