@naturalcycles/backend-lib 4.16.0 → 4.17.1

package/dist/deploy/deployHealthCheck.js

@@ -84,7 +84,7 @@ async function deployHealthCheck(url, opt = {}) {
         attempt++;
         console.log([`>>`, (0, colors_1.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
         const started = Date.now();
-        const { err, fetchResponse } = await fetcher.rawFetch(url, {
+        const { err, fetchResponse } = await fetcher.doFetch(url, {
             mode: 'json',
             timeoutSeconds: timeoutSec,
             retry: {

package/dist/index.d.ts

@@ -18,6 +18,7 @@ export * from './server/serverStatsMiddleware';
 export * from './server/methodOverrideMiddleware';
 export * from './server/notFoundMiddleware';
 export * from './server/okMiddleware';
+export * from './server/basicAuthMiddleware';
 export * from './server/requestTimeoutMiddleware';
 export * from './server/reqValidationMiddleware';
 export * from './server/simpleRequestLoggerMiddleware';

package/dist/index.js

@@ -23,6 +23,7 @@ tslib_1.__exportStar(require("./server/serverStatsMiddleware"), exports);
 tslib_1.__exportStar(require("./server/methodOverrideMiddleware"), exports);
 tslib_1.__exportStar(require("./server/notFoundMiddleware"), exports);
 tslib_1.__exportStar(require("./server/okMiddleware"), exports);
+tslib_1.__exportStar(require("./server/basicAuthMiddleware"), exports);
 tslib_1.__exportStar(require("./server/requestTimeoutMiddleware"), exports);
 tslib_1.__exportStar(require("./server/reqValidationMiddleware"), exports);
 tslib_1.__exportStar(require("./server/simpleRequestLoggerMiddleware"), exports);

package/dist/server/basicAuthMiddleware.d.ts

@@ -0,0 +1,13 @@
+import { StringMap } from '@naturalcycles/js-lib';
+import { BackendRequestHandler } from './server.model';
+export interface BasicAuthMiddlewareCfg {
+    /**
+     * Map from login (Sting) to password (String).
+     */
+    loginPasswordMap: StringMap;
+    /**
+     *
+     */
+    realm?: string;
+}
+export declare function basicAuthMiddleware(cfg: BasicAuthMiddlewareCfg): BackendRequestHandler;

package/dist/server/basicAuthMiddleware.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.basicAuthMiddleware = void 0;
+const js_lib_1 = require("@naturalcycles/js-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+function basicAuthMiddleware(cfg) {
+    const { realm } = cfg;
+    return function basicAuthMiddlewareHandler(req, res, next) {
+        const hash = (req.headers.authorization || '').split(' ')[1];
+        if (hash) {
+            const [login, password] = (0, js_lib_1._split)((0, nodejs_lib_1.base64ToString)(hash), ':', 2);
+            if (login && password && cfg.loginPasswordMap[login] === password) {
+                return next();
+            }
+        }
+        // Unauthorized
+        res
+            .set('WWW-Authenticate', `Basic${realm ? ` realm="${realm}"` : ''}`)
+            .status(401)
+            .send('Unauthorized');
+    };
+}
+exports.basicAuthMiddleware = basicAuthMiddleware;

package/package.json

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

package/src/deploy/deployHealthCheck.ts

@@ -126,7 +126,7 @@ export async function deployHealthCheck(
 
     const started = Date.now()
 
-    const { err, fetchResponse } = await fetcher.rawFetch(url, {
+    const { err, fetchResponse } = await fetcher.doFetch(url, {
       mode: 'json',
       timeoutSeconds: timeoutSec,
       retry: {

package/src/index.ts

@@ -18,6 +18,7 @@ export * from './server/serverStatsMiddleware'
 export * from './server/methodOverrideMiddleware'
 export * from './server/notFoundMiddleware'
 export * from './server/okMiddleware'
+export * from './server/basicAuthMiddleware'
 export * from './server/requestTimeoutMiddleware'
 export * from './server/reqValidationMiddleware'
 export * from './server/simpleRequestLoggerMiddleware'

package/src/server/basicAuthMiddleware.ts

@@ -0,0 +1,35 @@
+import { _split, StringMap } from '@naturalcycles/js-lib'
+import { base64ToString } from '@naturalcycles/nodejs-lib'
+import { BackendRequestHandler } from './server.model'
+
+export interface BasicAuthMiddlewareCfg {
+  /**
+   * Map from login (Sting) to password (String).
+   */
+  loginPasswordMap: StringMap
+
+  /**
+   *
+   */
+  realm?: string
+}
+
+export function basicAuthMiddleware(cfg: BasicAuthMiddlewareCfg): BackendRequestHandler {
+  const { realm } = cfg
+
+  return function basicAuthMiddlewareHandler(req, res, next) {
+    const hash = (req.headers.authorization || '').split(' ')[1]
+    if (hash) {
+      const [login, password] = _split(base64ToString(hash), ':', 2)
+      if (login && password && cfg.loginPasswordMap[login] === password) {
+        return next()
+      }
+    }
+
+    // Unauthorized
+    res
+      .set('WWW-Authenticate', `Basic${realm ? ` realm="${realm}"` : ''}`)
+      .status(401)
+      .send('Unauthorized')
+  }
+}

package/src/server/genericErrorMiddleware.ts

@@ -95,7 +95,7 @@ export function respondWithError(req: BackendRequest, res: BackendResponse, err:
 
   res.status(httpError.data.httpStatusCode).json({
     error: httpError,
-  } as HttpErrorResponse)
+  } satisfies HttpErrorResponse)
 }
 
 function shouldReportToSentry(err: Error): boolean {