@naturalcycles/backend-lib 5.6.0 → 5.7.0

package/dist/admin/adminMiddleware.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLoginHtmlRedirect = exports.loginHtml = exports.requireAdminPermissions = exports.createAdminMiddleware = void 0;
+exports.createAdminMiddleware = createAdminMiddleware;
+exports.requireAdminPermissions = requireAdminPermissions;
+exports.loginHtml = loginHtml;
+exports.getLoginHtmlRedirect = getLoginHtmlRedirect;
 const tslib_1 = require("tslib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -11,7 +14,6 @@ function createAdminMiddleware(adminService, cfgDefaults = {}) {
         ...cfg,
     });
 }
-exports.createAdminMiddleware = createAdminMiddleware;
 /**
  * Require Admin permission.
  * If not authenticated - will redirect to `loginHtmlPath` (default to /login.html).
@@ -39,7 +41,6 @@ function requireAdminPermissions(adminService, reqPermissions = [], cfg = {}) {
         }
     };
 }
-exports.requireAdminPermissions = requireAdminPermissions;
 function loginHtml(firebaseServiceCfg) {
     const { apiKey: firebaseApiKey, authDomain: firebaseAuthDomain, adminAuthProvider: firebaseAuthProvider = 'GoogleAuthProvider', } = firebaseServiceCfg;
     return (req, res) => {
@@ -50,7 +51,6 @@ function loginHtml(firebaseServiceCfg) {
         }));
     };
 }
-exports.loginHtml = loginHtml;
 const getLoginHtml = (0, js_lib_1._memoFn)((cfg) => {
     console.log(`reading login.html`);
     const tmpl = nodejs_lib_1.fs2.readText(`${__dirname}/login.html`);
@@ -68,4 +68,3 @@ function getLoginHtmlRedirect(href) {
 </html>
 `;
 }
-exports.getLoginHtmlRedirect = getLoginHtmlRedirect;

package/dist/admin/secureHeaderMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSecureHeaderMiddleware = void 0;
+exports.createSecureHeaderMiddleware = createSecureHeaderMiddleware;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const adminMiddleware_1 = require("./adminMiddleware");
@@ -11,7 +11,6 @@ const adminMiddleware_1 = require("./adminMiddleware");
 function createSecureHeaderMiddleware(cfg) {
     return reqPermissions => requireSecureHeaderOrAdmin(cfg, reqPermissions);
 }
-exports.createSecureHeaderMiddleware = createSecureHeaderMiddleware;
 function requireSecureHeaderOrAdmin(cfg, reqPermissions) {
     const { secureHeaderKey = 'Authorization', secureHeaderValue } = cfg;
     const requireAdmin = (0, adminMiddleware_1.requireAdminPermissions)(cfg.adminService, reqPermissions, cfg);

package/dist/db/httpDBRequestHandler.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpDBRequestHandler = void 0;
+exports.httpDBRequestHandler = httpDBRequestHandler;
 const db_lib_1 = require("@naturalcycles/db-lib");
 const validation_1 = require("@naturalcycles/db-lib/dist/validation");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -84,4 +84,3 @@ function httpDBRequestHandler(db) {
     });
     return router;
 }
-exports.httpDBRequestHandler = httpDBRequestHandler;

package/dist/deploy/backend.cfg.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackendCfg = void 0;
+exports.getBackendCfg = getBackendCfg;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../paths.cnst");
 const backendCfgSchema = nodejs_lib_1.AjvSchema.readJsonSync(`${paths_cnst_1.resourcesDir}/backendCfg.schema.json`, {
@@ -15,4 +15,3 @@ function getBackendCfg(projectDir = '.') {
     backendCfgSchema.validate(backendCfg);
     return backendCfg;
 }
-exports.getBackendCfg = getBackendCfg;

package/dist/deploy/deploy.util.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateGAEServiceName = exports.createAppYaml = exports.createAndSaveAppYaml = exports.createDeployInfo = exports.createAndSaveDeployInfo = void 0;
+exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
+exports.createDeployInfo = createDeployInfo;
+exports.createAndSaveAppYaml = createAndSaveAppYaml;
+exports.createAppYaml = createAppYaml;
+exports.validateGAEServiceName = validateGAEServiceName;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const APP_YAML_DEFAULT = () => ({
@@ -28,7 +32,6 @@ async function createAndSaveDeployInfo(backendCfg, targetDir) {
     console.log(`saved ${(0, nodejs_lib_1.dimGrey)(deployInfoPath)}`);
     return deployInfo;
 }
-exports.createAndSaveDeployInfo = createAndSaveDeployInfo;
 async function createDeployInfo(backendCfg, overrideBranch) {
     const simpleGit = require('simple-git'); // lazy load
     const git = simpleGit('.');
@@ -70,7 +73,6 @@ async function createDeployInfo(backendCfg, overrideBranch) {
     console.log({ deployInfo });
     return deployInfo;
 }
-exports.createDeployInfo = createDeployInfo;
 function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv = '') {
     const appYaml = createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv);
     const appYamlPath = `${targetDir}/app.yaml`;
@@ -78,7 +80,6 @@ function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, app
     console.log(`saved ${(0, nodejs_lib_1.dimGrey)(appYamlPath)}`);
     return appYaml;
 }
-exports.createAndSaveAppYaml = createAndSaveAppYaml;
 function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '') {
     const { appEnvDefault, appEnvByBranch = {} } = backendCfg;
     const { gaeService: service, gitBranch } = deployInfo;
@@ -129,7 +130,6 @@ function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv = '')
     });
     return appYaml;
 }
-exports.createAppYaml = createAppYaml;
 function redactedAppYaml(appYaml) {
     return {
         ...appYaml,
@@ -144,4 +144,3 @@ function validateGAEServiceName(serviceName) {
         .replaceAll(/[^0-9a-z-]/gi, '')
         .slice(0, 40);
 }
-exports.validateGAEServiceName = validateGAEServiceName;

package/dist/deploy/deployGae.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undeployGae = exports.deployGae = void 0;
+exports.deployGae = deployGae;
+exports.undeployGae = undeployGae;
 const dev_lib_1 = require("@naturalcycles/dev-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -58,7 +59,6 @@ async function deployGae(opt = {}) {
         logs(gaeProject, gaeService, gaeVersion);
     }
 }
-exports.deployGae = deployGae;
 /**
  * Undeploys/removes the GAE service/version, using the same rules as deployGae.
  * Detects the service/version by the same criteria: branch name, backend.cfg.yaml, etc.
@@ -75,7 +75,6 @@ async function undeployGae(branch) {
     (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`, [], { shell: true });
     (0, nodejs_lib_1.appendToGithubSummary)(`removed ${gaeProject}/${gaeService}/${gaeVersion}`);
 }
-exports.undeployGae = undeployGae;
 function logs(gaeProject, gaeService, gaeVersion) {
     try {
         (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });

package/dist/deploy/deployHealthCheck.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployHealthCheck = exports.deployHealthCheckYargsOptions = void 0;
+exports.deployHealthCheckYargsOptions = void 0;
+exports.deployHealthCheck = deployHealthCheck;
 const node_util_1 = require("node:util");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -139,4 +140,3 @@ async function deployHealthCheck(url, opt = {}) {
         }
     }
 }
-exports.deployHealthCheck = deployHealthCheck;

package/dist/deploy/deployPrepare.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployPrepare = exports.deployPrepareYargsOptions = void 0;
+exports.deployPrepareYargsOptions = void 0;
+exports.deployPrepare = deployPrepare;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../paths.cnst");
 const backend_cfg_util_1 = require("./backend.cfg.util");
@@ -81,4 +82,3 @@ async function deployPrepare(opt = {}) {
     (0, deploy_util_1.createAndSaveAppYaml)(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv);
     return deployInfo;
 }
-exports.deployPrepare = deployPrepare;

package/dist/gae/appEngine.util.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGAE = void 0;
+exports.isGAE = isGAE;
 const { GAE_INSTANCE } = process.env;
 function isGAE() {
     return !!GAE_INSTANCE;
 }
-exports.isGAE = isGAE;

package/dist/server/appEngineLogMiddleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appEngineLogMiddleware = exports.ciLogger = exports.devLogger = exports.gaeLogger = void 0;
+exports.ciLogger = exports.devLogger = exports.gaeLogger = void 0;
+exports.appEngineLogMiddleware = appEngineLogMiddleware;
 const node_util_1 = require("node:util");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE } = process.env;
@@ -86,4 +87,3 @@ function appEngineLogMiddleware() {
         next();
     };
 }
-exports.appEngineLogMiddleware = appEngineLogMiddleware;

package/dist/server/asyncLocalStorageMiddleware.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestLogger = exports.getRequestLogger = exports.getRequest = exports.asyncLocalStorageMiddleware = void 0;
+exports.requestLogger = void 0;
+exports.asyncLocalStorageMiddleware = asyncLocalStorageMiddleware;
+exports.getRequest = getRequest;
+exports.getRequestLogger = getRequestLogger;
 const node_async_hooks_1 = require("node:async_hooks");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const appEngineLogMiddleware_1 = require("./appEngineLogMiddleware");
@@ -18,11 +21,9 @@ function asyncLocalStorageMiddleware() {
         storage().run(store, () => next());
     };
 }
-exports.asyncLocalStorageMiddleware = asyncLocalStorageMiddleware;
 function getRequest() {
     return storage().getStore()?.req;
 }
-exports.getRequest = getRequest;
 /**
  * It requires both `createAsyncLocalStorage` and `createGAELogMiddleware` to be in use to work.
  *
@@ -31,7 +32,6 @@ exports.getRequest = getRequest;
 function getRequestLogger() {
     return storage().getStore()?.req || (isGAE ? appEngineLogMiddleware_1.gaeLogger : isCI ? appEngineLogMiddleware_1.ciLogger : appEngineLogMiddleware_1.devLogger);
 }
-exports.getRequestLogger = getRequestLogger;
 /**
  * CommonLogger implementation that is Request-bound.
  * Should work the same as `req.log`, except that you don't have to have `req` available - it'll get it

package/dist/server/basicAuthMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.basicAuthMiddleware = void 0;
+exports.basicAuthMiddleware = basicAuthMiddleware;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function basicAuthMiddleware(cfg) {
@@ -20,4 +20,3 @@ function basicAuthMiddleware(cfg) {
             .send('Unauthorized');
     };
 }
-exports.basicAuthMiddleware = basicAuthMiddleware;

package/dist/server/bodyParserTimeoutMiddleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearBodyParserTimeout = exports.bodyParserTimeoutMiddleware = void 0;
+exports.bodyParserTimeoutMiddleware = bodyParserTimeoutMiddleware;
+exports.clearBodyParserTimeout = clearBodyParserTimeout;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../index");
 const code = 'BODY_PARSER_TIMEOUT';
@@ -30,7 +31,6 @@ function bodyParserTimeoutMiddleware(cfg = {}) {
         next();
     };
 }
-exports.bodyParserTimeoutMiddleware = bodyParserTimeoutMiddleware;
 /**
  * Should be called AFTER bodyParser
  */
@@ -40,4 +40,3 @@ function clearBodyParserTimeout() {
         next();
     };
 }
-exports.clearBodyParserTimeout = clearBodyParserTimeout;

package/dist/server/createDefaultApp.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefaultApp = void 0;
+exports.createDefaultApp = createDefaultApp;
 const cookieParser = require("cookie-parser");
 const cors = require("cors");
 const express = require("express");
@@ -87,7 +87,6 @@ function createDefaultApp(cfg) {
     app.use((0, genericErrorMiddleware_1.genericErrorMiddleware)({ sentryService, ...cfg.genericErrorMwCfg }));
     return app;
 }
-exports.createDefaultApp = createDefaultApp;
 function useHandlers(app, handlers = []) {
     handlers
         .map(cfg => {

package/dist/server/genericErrorMiddleware.d.ts

@@ -16,7 +16,7 @@ export interface GenericErrorMiddlewareCfg {
 }
 /**
  * Generic error handler.
- * Returns HTTP code based on err.data.httpStatusCode (default to 500).
+ * Returns HTTP code based on err.data.backendResponseStatusCode (default to 500).
  * Sends json payload as ErrorResponse, transformed via errorSharedUtil.
  */
 export declare function genericErrorMiddleware(cfg?: GenericErrorMiddlewareCfg): BackendErrorRequestHandler;

package/dist/server/genericErrorMiddleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.respondWithError = exports.genericErrorMiddleware = void 0;
+exports.genericErrorMiddleware = genericErrorMiddleware;
+exports.respondWithError = respondWithError;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const { APP_ENV } = process.env;
 const includeErrorStack = APP_ENV === 'dev';
@@ -10,7 +11,7 @@ let reportOnly5xx = false;
 let formatError;
 /**
  * Generic error handler.
- * Returns HTTP code based on err.data.httpStatusCode (default to 500).
+ * Returns HTTP code based on err.data.backendResponseStatusCode (default to 500).
  * Sends json payload as ErrorResponse, transformed via errorSharedUtil.
  */
 function genericErrorMiddleware(cfg = {}) {
@@ -32,7 +33,6 @@ function genericErrorMiddleware(cfg = {}) {
         respondWithError(req, res, err);
     };
 }
-exports.genericErrorMiddleware = genericErrorMiddleware;
 function respondWithError(req, res, err) {
     const { headersSent } = res;
     if (headersSent) {
@@ -53,9 +53,6 @@ function respondWithError(req, res, err) {
         delete httpError.stack;
     httpError.data.errorId = errorId;
     httpError.data.backendResponseStatusCode ||= 500; // default to 500
-    // httpStatusCode is for backwards-compatibility
-    // Otherwise, it breaks the _isHttpErrorResponse function check, and error get formatted/detected wrongly
-    httpError.data['httpStatusCode'] = httpError.data.backendResponseStatusCode;
     httpError.data.headersSent = headersSent || undefined;
     (0, js_lib_1._filterUndefinedValues)(httpError.data, true);
     formatError?.(httpError); // Mutates
@@ -63,7 +60,6 @@ function respondWithError(req, res, err) {
         error: httpError,
     });
 }
-exports.respondWithError = respondWithError;
 function shouldReportToSentry(err) {
     const e = err;
     // By default - report

package/dist/server/getDefaultRouter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultRouter = void 0;
+exports.getDefaultRouter = getDefaultRouter;
 const tslib_1 = require("tslib");
 const express_promise_router_1 = tslib_1.__importDefault(require("express-promise-router"));
 /**
@@ -12,4 +12,3 @@ function getDefaultRouter(defaultHandlers = []) {
     defaultHandlers.forEach(h => router.use(h));
     return router;
 }
-exports.getDefaultRouter = getDefaultRouter;

package/dist/server/methodOverrideMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.methodOverrideMiddleware = void 0;
+exports.methodOverrideMiddleware = methodOverrideMiddleware;
 function methodOverrideMiddleware(cfg = {}) {
     const { methodKey } = {
         methodKey: '_method',
@@ -14,4 +14,3 @@ function methodOverrideMiddleware(cfg = {}) {
         next();
     };
 }
-exports.methodOverrideMiddleware = methodOverrideMiddleware;

package/dist/server/notFoundMiddleware.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notFoundMiddleware = void 0;
+exports.notFoundMiddleware = notFoundMiddleware;
 const request_util_1 = require("./request.util");
 function notFoundMiddleware() {
     return (req, res) => {
         res.status(404).send(`404 Not Found: ${(0, request_util_1.getRequestEndpoint)(req)}`);
     };
 }
-exports.notFoundMiddleware = notFoundMiddleware;

package/dist/server/okMiddleware.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.okMiddleware = void 0;
+exports.okMiddleware = okMiddleware;
 function okMiddleware() {
     return (req, res) => {
         res.json({ ok: 1 });
     };
 }
-exports.okMiddleware = okMiddleware;

package/dist/server/request.log.util.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.coloredHttpCode = exports.logRequest = void 0;
+exports.logRequest = logRequest;
+exports.coloredHttpCode = coloredHttpCode;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function logRequest(req, statusCode, ...tokens) {
     req[logLevel(statusCode)]([coloredHttpCode(statusCode), req.method, (0, nodejs_lib_1.boldGrey)(req.url), ...tokens].join(' '));
 }
-exports.logRequest = logRequest;
 function coloredHttpCode(statusCode) {
     if (statusCode >= 200 && statusCode < 400)
         return (0, nodejs_lib_1.green)(statusCode);
@@ -13,7 +13,6 @@ function coloredHttpCode(statusCode) {
         return (0, nodejs_lib_1.yellow)(statusCode);
     return (0, nodejs_lib_1.red)(statusCode);
 }
-exports.coloredHttpCode = coloredHttpCode;
 function logLevel(statusCode) {
     if (!statusCode || statusCode < 400)
         return 'log';

package/dist/server/request.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRequestEndpoint = void 0;
+exports.getRequestEndpoint = getRequestEndpoint;
 /**
  * Returns e.g:
  *
@@ -16,4 +16,3 @@ function getRequestEndpoint(req) {
     }
     return [req.method, path].join(' ');
 }
-exports.getRequestEndpoint = getRequestEndpoint;

package/dist/server/requestTimeoutMiddleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.customRequestTimeoutMiddleware = exports.requestTimeoutMiddleware = void 0;
+exports.requestTimeoutMiddleware = requestTimeoutMiddleware;
+exports.customRequestTimeoutMiddleware = customRequestTimeoutMiddleware;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../index");
 const code = 'REQUEST_TIMEOUT';
@@ -39,7 +40,6 @@ function requestTimeoutMiddleware(cfg = {}) {
         next();
     };
 }
-exports.requestTimeoutMiddleware = requestTimeoutMiddleware;
 /**
  * Example:
  *
@@ -65,4 +65,3 @@ function customRequestTimeoutMiddleware(onTimeout, cfg) {
         next();
     };
 }
-exports.customRequestTimeoutMiddleware = customRequestTimeoutMiddleware;

package/dist/server/safeJsonMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeJsonMiddleware = void 0;
+exports.safeJsonMiddleware = safeJsonMiddleware;
 const js_lib_1 = require("@naturalcycles/js-lib");
 /**
  * Replaces express's built-in req.json() function with the safe one,
@@ -19,4 +19,3 @@ function safeJsonMiddleware() {
         next();
     };
 }
-exports.safeJsonMiddleware = safeJsonMiddleware;

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

@@ -1,5 +1,3 @@
-/// <reference types="cookie-parser" />
-/// <reference types="node" />
 import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib';
 import type { IRouter, Request, NextFunction, Response, Application } from 'express';
 /**

package/dist/server/server.util.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Server } from 'node:http';
 export interface DestroyableServer extends Server {
     destroy: () => Promise<void>;

package/dist/server/server.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enableDestroy = void 0;
+exports.enableDestroy = enableDestroy;
 /**
  * Based on: https://github.com/isaacs/server-destroy/blob/master/index.js
  *
@@ -25,4 +25,3 @@ function enableDestroy(server) {
     };
     return srv;
 }
-exports.enableDestroy = enableDestroy;

package/dist/server/serverStatsMiddleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serverStatsMiddleware = exports.serverStatsHTMLHandler = void 0;
+exports.serverStatsHTMLHandler = void 0;
+exports.serverStatsMiddleware = serverStatsMiddleware;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../index");
 const request_util_1 = require("./request.util");
@@ -96,7 +97,6 @@ function serverStatsMiddleware() {
         next();
     };
 }
-exports.serverStatsMiddleware = serverStatsMiddleware;
 function cleanupServerStats() {
     if (Object.keys(serverStatsMap).length <= MAX_ENDPOINTS)
         return;

package/dist/server/serverStatusMiddleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServerStatusData = exports.serverStatusMiddleware = void 0;
+exports.serverStatusMiddleware = serverStatusMiddleware;
+exports.getServerStatusData = getServerStatusData;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const deployInfo_util_1 = require("./deployInfo.util");
@@ -11,7 +12,6 @@ function serverStatusMiddleware(projectDir, extra) {
         res.json(getServerStatusData(projectDir, extra));
     };
 }
-exports.serverStatusMiddleware = serverStatusMiddleware;
 function getServerStatusData(projectDir = process.cwd(), extra) {
     const { gitRev, gitBranch, ts } = (0, deployInfo_util_1.getDeployInfo)(projectDir);
     const t = (0, js_lib_1.localTime)(ts);
@@ -34,7 +34,6 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
         ...extra,
     });
 }
-exports.getServerStatusData = getServerStatusData;
 function getStartedStr() {
     const started = js_lib_1.localTime.now().minus(process.uptime(), 'second');
     return `${started.toPretty()} (${started.fromNow()})`;

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simpleRequestLoggerMiddleware = void 0;
+exports.simpleRequestLoggerMiddleware = simpleRequestLoggerMiddleware;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const index_1 = require("../index");
@@ -36,4 +36,3 @@ function simpleRequestLoggerMiddleware(_cfg = {}) {
         next();
     };
 }
-exports.simpleRequestLoggerMiddleware = simpleRequestLoggerMiddleware;

package/dist/server/startServer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Server } from 'node:http';
 import { StartServerCfg, StartServerData } from './startServer.model';
 export declare class BackendServer {

package/dist/server/startServer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startServer = exports.BackendServer = void 0;
+exports.BackendServer = void 0;
+exports.startServer = startServer;
 const tslib_1 = require("tslib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -95,4 +96,3 @@ async function startServer(cfg) {
         throw err;
     }
 }
-exports.startServer = startServer;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Server } from 'node:http';
 import { SentrySharedService } from '../sentry/sentry.shared.service';
 import { DefaultAppCfg } from './createDefaultApp.model';

package/dist/server/validation/validateMiddleware.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateQuery = exports.validateParams = exports.validateBody = void 0;
+exports.validateBody = validateBody;
+exports.validateParams = validateParams;
+exports.validateQuery = validateQuery;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const REDACTED = 'REDACTED';
 function validateBody(schema, opt = {}) {
     return validateObject('body', schema, opt);
 }
-exports.validateBody = validateBody;
 function validateParams(schema, opt = {}) {
     return validateObject('params', schema, opt);
 }
-exports.validateParams = validateParams;
 function validateQuery(schema, opt = {}) {
     return validateObject('query', schema, opt);
 }
-exports.validateQuery = validateQuery;
 /**
  * Validates req property (body, params or query).
  * Supports Joi schema or AjvSchema (from nodejs-lib).

package/dist/server/validation/zodValidateMiddleware.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zodReqValidate = void 0;
+exports.zodReqValidate = zodReqValidate;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const REDACTED = 'REDACTED';
 /**
@@ -26,7 +26,6 @@ function zodReqValidate(prop, schema, opt = {}) {
         }));
     };
 }
-exports.zodReqValidate = zodReqValidate;
 /**
  * Mutates error
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "scripts": {
     "prepare": "husky",
     "dev": "APP_ENV=dev node -r ts-node/register --watch ./src/test/server/server.ts",

package/src/deploy/deploy.util.ts

@@ -55,7 +55,7 @@ export async function createDeployInfo(
   gaeProject = gaeProjectByBranch[gitBranch] || gaeProject
 
   if (gaeServiceByBranch[gitBranch]) {
-    gaeService = validateGAEServiceName(gaeServiceByBranch[gitBranch]!)
+    gaeService = validateGAEServiceName(gaeServiceByBranch[gitBranch])
   } else {
     gaeService = validateGAEServiceName([gitBranch, gaeService].join('--'))
   }

package/src/server/genericErrorMiddleware.ts

@@ -35,7 +35,7 @@ let formatError: GenericErrorMiddlewareCfg['formatError']
 
 /**
  * Generic error handler.
- * Returns HTTP code based on err.data.httpStatusCode (default to 500).
+ * Returns HTTP code based on err.data.backendResponseStatusCode (default to 500).
  * Sends json payload as ErrorResponse, transformed via errorSharedUtil.
  */
 export function genericErrorMiddleware(
@@ -86,9 +86,6 @@ export function respondWithError(req: BackendRequest, res: BackendResponse, err:
 
   httpError.data.errorId = errorId
   httpError.data.backendResponseStatusCode ||= 500 // default to 500
-  // httpStatusCode is for backwards-compatibility
-  // Otherwise, it breaks the _isHttpErrorResponse function check, and error get formatted/detected wrongly
-  httpError.data['httpStatusCode'] = httpError.data.backendResponseStatusCode
   httpError.data.headersSent = headersSent || undefined
   _filterUndefinedValues(httpError.data, true)
 

package/src/server/serverStatsMiddleware.ts

@@ -127,9 +127,9 @@ export function serverStatsMiddleware(): BackendRequestHandler {
         '5xx': 0,
       }
 
-      serverStatsMap[endpoint]!.stack.push(latency)
+      serverStatsMap[endpoint].stack.push(latency)
       if (res.statusCode) {
-        serverStatsMap[endpoint]![getStatusFamily(res.statusCode)]++
+        serverStatsMap[endpoint][getStatusFamily(res.statusCode)]++
       }
 
       if (now - lastCleanup > 60_000) {