@naturalcycles/backend-lib 9.13.0 → 9.15.0

package/dist/admin/adminMiddleware.js

@@ -1,6 +1,5 @@
 import { _memoFn, AppError } from '@naturalcycles/js-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
-import ejs from 'ejs';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { srcDir } from '../paths.cnst.js';
 export function createAdminMiddleware(adminService, cfgDefaults = {}) {
     return (reqPermissions, cfg) => requireAdminPermissions(adminService, reqPermissions, {
@@ -37,17 +36,18 @@ export function requireAdminPermissions(adminService, reqPermissions = [], cfg =
 }
 export function loginHtml(firebaseServiceCfg) {
     const { apiKey: firebaseApiKey, authDomain: firebaseAuthDomain, adminAuthProvider: firebaseAuthProvider = 'GoogleAuthProvider', } = firebaseServiceCfg;
-    return (_req, res) => {
-        res.send(getLoginHtml({
+    return async (_req, res) => {
+        res.send(await getLoginHtml({
             firebaseApiKey,
             firebaseAuthDomain,
             firebaseAuthProvider,
         }));
     };
 }
-const getLoginHtml = _memoFn((cfg) => {
+const getLoginHtml = _memoFn(async (cfg) => {
     console.log(`reading login.html`);
     const tmpl = fs2.readText(`${srcDir}/admin/login.html`);
+    const { default: ejs } = await import('ejs');
     return ejs.render(tmpl, cfg);
 });
 export function getLoginHtmlRedirect(href) {

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

@@ -1,5 +1,5 @@
 import { _assert, AppError } from '@naturalcycles/js-lib';
-import { dimGrey, green, red } from '@naturalcycles/nodejs-lib';
+import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors';
 const adminInfoDisabled = () => ({
     email: 'authDisabled',
     permissions: [],

package/dist/admin/index.d.ts

@@ -0,0 +1,4 @@
+export * from './adminMiddleware.js';
+export * from './base.admin.service.js';
+export * from './firebase.shared.service.js';
+export * from './secureHeaderMiddleware.js';

package/dist/admin/index.js

@@ -0,0 +1,4 @@
+export * from './adminMiddleware.js';
+export * from './base.admin.service.js';
+export * from './firebase.shared.service.js';
+export * from './secureHeaderMiddleware.js';

package/dist/db/httpDBRequestHandler.js

@@ -1,8 +1,8 @@
 import { DBQuery, InMemoryDB } from '@naturalcycles/db-lib';
 import { commonDBOptionsSchema, commonDBSaveOptionsSchema, dbQuerySchema, } from '@naturalcycles/db-lib/validation';
 import { anyObjectSchema, arraySchema, objectSchema, stringSchema, } from '@naturalcycles/nodejs-lib/joi';
-import { getDefaultRouter } from '../server/getDefaultRouter.js';
-import { validateRequest } from '../server/validation/validateRequest.js';
+import { getDefaultRouter } from '../express/getDefaultRouter.js';
+import { validateRequest } from '../validation/joi/joiValidateRequest.js';
 const getByIdsInputSchema = objectSchema({
     table: stringSchema,
     ids: arraySchema(stringSchema),

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

@@ -1,5 +1,6 @@
 import { AjvSchema } from '@naturalcycles/nodejs-lib/ajv';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { yaml2 } from '@naturalcycles/nodejs-lib/yaml2';
 import { resourcesDir } from '../paths.cnst.js';
 const backendCfgSchema = AjvSchema.readJsonSync(`${resourcesDir}/backendCfg.schema.json`, {
     objectName: 'backend.cfg.yaml',
@@ -8,7 +9,7 @@ export function getBackendCfg(projectDir = '.') {
     const backendCfgYamlPath = `${projectDir}/backend.cfg.yaml`;
     fs2.requireFileToExist(backendCfgYamlPath);
     const backendCfg = {
-        ...fs2.readYaml(backendCfgYamlPath),
+        ...yaml2.readYaml(backendCfgYamlPath),
     };
     backendCfgSchema.validate(backendCfg);
     return backendCfg;

package/dist/deploy/deploy.util.js

@@ -1,6 +1,8 @@
 import { _assert, _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib';
-import { dimGrey, sha256, white } from '@naturalcycles/nodejs-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { sha256 } from '@naturalcycles/nodejs-lib';
+import { dimGrey, white } from '@naturalcycles/nodejs-lib/colors';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { yaml2 } from '@naturalcycles/nodejs-lib/yaml2';
 const APP_YAML_DEFAULT = () => ({
     runtime: 'nodejs22',
     service: 'default',
@@ -77,7 +79,7 @@ export async function createDeployInfo(backendCfg, overrideBranch) {
 export function createAndSaveAppYaml(backendCfg, deployInfo, projectDir, targetDir, appYamlPassEnv = '') {
     const appYaml = createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv);
     const appYamlPath = `${targetDir}/app.yaml`;
-    fs2.writeYaml(appYamlPath, appYaml);
+    yaml2.writeYaml(appYamlPath, appYaml);
     console.log(`saved ${dimGrey(appYamlPath)}`);
     return appYaml;
 }
@@ -94,12 +96,12 @@ export function createAppYaml(backendCfg, deployInfo, projectDir, appYamlPassEnv
     const appYamlPath = `${projectDir}/app.yaml`;
     if (fs2.pathExists(appYamlPath)) {
         console.log(`merging-in ${dimGrey(appYamlPath)}`);
-        _merge(appYaml, fs2.readYaml(appYamlPath));
+        _merge(appYaml, yaml2.readYaml(appYamlPath));
     }
     const appEnvYamlPath = `${projectDir}/app.${APP_ENV}.yaml`;
     if (fs2.pathExists(appEnvYamlPath)) {
         console.log(`merging-in ${dimGrey(appEnvYamlPath)}`);
-        _merge(appYaml, fs2.readYaml(appEnvYamlPath));
+        _merge(appYaml, yaml2.readYaml(appEnvYamlPath));
     }
     // appYamlPassEnv
     const passEnv = appYamlPassEnv

package/dist/deploy/deployGae.js

@@ -1,6 +1,7 @@
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib';
-import { exec2 } from '@naturalcycles/nodejs-lib';
-import { appendToGithubSummary, fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { appendToGithubSummary } from '@naturalcycles/nodejs-lib/env';
+import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { getBackendCfg } from './backend.cfg.util.js';
 import { createDeployInfo } from './deploy.util.js';
 import { deployHealthCheck } from './deployHealthCheck.js';

package/dist/deploy/deployHealthCheck.js

@@ -1,6 +1,7 @@
 import { inspect } from 'node:util';
 import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib';
-import { dimGrey, exec2, red } from '@naturalcycles/nodejs-lib';
+import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors';
+import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { coloredHttpCode } from '../server/request.log.util.js';
 export const deployHealthCheckYargsOptions = {
     thresholdHealthy: {

package/dist/{server → deploy}/deployInfo.util.d.ts

@@ -1,2 +1,2 @@
-import type { DeployInfo } from '../deploy/index.js';
+import type { DeployInfo } from './deploy.model.js';
 export declare const getDeployInfo: ((projectDir: string) => DeployInfo) & import("@naturalcycles/js-lib").MemoizedFunction;

package/dist/{server → deploy}/deployInfo.util.js

@@ -1,5 +1,5 @@
 import { _memoFn, localTime } from '@naturalcycles/js-lib';
-import { fs2 } from '@naturalcycles/nodejs-lib/fs';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 export const getDeployInfo = _memoFn((projectDir) => {
     const deployInfoPath = `${projectDir}/deployInfo.json`;
     try {

package/dist/deploy/deployPrepare.js

@@ -1,5 +1,6 @@
-import { dimGrey } from '@naturalcycles/nodejs-lib';
-import { fs2, kpySync } from '@naturalcycles/nodejs-lib/fs';
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
+import { kpySync } from '@naturalcycles/nodejs-lib/kpy';
 import { srcDir } from '../paths.cnst.js';
 import { getBackendCfg } from './backend.cfg.util.js';
 import { createAndSaveAppYaml, createAndSaveDeployInfo } from './deploy.util.js';

package/dist/deploy/index.d.ts

@@ -8,3 +8,4 @@ import { deployHealthCheck } from './deployHealthCheck.js';
 import { deployPrepare } from './deployPrepare.js';
 export type { BackendCfg, DeployHealthCheckOptions, DeployInfo };
 export { createAppYaml, createDeployInfo, deployGae, deployHealthCheck, deployPrepare, getBackendCfg, };
+export * from './deployInfo.util.js';

package/dist/deploy/index.js

@@ -4,3 +4,4 @@ import { deployGae } from './deployGae.js';
 import { deployHealthCheck } from './deployHealthCheck.js';
 import { deployPrepare } from './deployPrepare.js';
 export { createAppYaml, createDeployInfo, deployGae, deployHealthCheck, deployPrepare, getBackendCfg, };
+export * from './deployInfo.util.js';

package/dist/env/env.shared.service.js

@@ -1,5 +1,5 @@
 import { _assert, _by } from '@naturalcycles/js-lib';
-import { dimGrey } from '@naturalcycles/nodejs-lib';
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 export class EnvSharedService {
     constructor(cfg) {
         this.envMap = _by(cfg.environments, e => e.name);

package/dist/{server/createDefaultApp.model.d.ts → express/createDefaultApp.d.ts}

@@ -1,8 +1,9 @@
 import type { Options, OptionsJson, OptionsUrlencoded } from 'body-parser';
 import type { CorsOptions } from 'cors';
 import type { SentrySharedService } from '../sentry/sentry.shared.service.js';
-import type { GenericErrorMiddlewareCfg } from './genericErrorMiddleware.js';
-import type { BackendRequestHandler } from './server.model.js';
+import { type GenericErrorMiddlewareCfg } from '../server/genericErrorMiddleware.js';
+import type { BackendApplication, BackendRequestHandler } from '../server/server.model.js';
+export declare function createDefaultApp(cfg: DefaultAppCfg): Promise<BackendApplication>;
 /**
  * Plain RequestHandler can be provided - then it's mounted to /
  * Otherwise `path` can be provided to specify mounting point.

package/dist/{server → express}/createDefaultApp.js

@@ -1,17 +1,17 @@
-import cookieParser from 'cookie-parser';
-import cors from 'cors';
-import express from 'express';
-import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware.js';
-import { genericErrorMiddleware } from './genericErrorMiddleware.js';
-import { logMiddleware } from './logMiddleware.js';
-import { methodOverrideMiddleware } from './methodOverrideMiddleware.js';
-import { notFoundMiddleware } from './notFoundMiddleware.js';
-import { requestTimeoutMiddleware } from './requestTimeoutMiddleware.js';
-import { simpleRequestLoggerMiddleware } from './simpleRequestLoggerMiddleware.js';
+import { asyncLocalStorageMiddleware } from '../server/asyncLocalStorageMiddleware.js';
+import { genericErrorMiddleware, } from '../server/genericErrorMiddleware.js';
+import { logMiddleware } from '../server/logMiddleware.js';
+import { methodOverrideMiddleware } from '../server/methodOverrideMiddleware.js';
+import { notFoundMiddleware } from '../server/notFoundMiddleware.js';
+import { requestTimeoutMiddleware } from '../server/requestTimeoutMiddleware.js';
+import { simpleRequestLoggerMiddleware } from '../server/simpleRequestLoggerMiddleware.js';
 const isTest = process.env['APP_ENV'] === 'test';
 const isDev = process.env['APP_ENV'] === 'dev';
 export async function createDefaultApp(cfg) {
     const { sentryService } = cfg;
+    const { default: express } = await import('express');
+    const { default: cors } = await import('cors');
+    const { default: cookieParser } = await import('cookie-parser');
     const app = express();
     app.disable('etag');
     app.disable('x-powered-by');

package/dist/{server → express}/getDefaultRouter.d.ts

@@ -1,4 +1,4 @@
-import type { BackendRequestHandler, BackendRouter } from './server.model.js';
+import type { BackendRequestHandler, BackendRouter } from '../server/server.model.js';
 /**
  * Convenience method.
  */

package/dist/{server/startServer.model.d.ts → express/startServer.d.ts}

@@ -1,7 +1,22 @@
 import type { Server } from 'node:http';
 import type { SentrySharedService } from '../sentry/sentry.shared.service.js';
-import type { DefaultAppCfg } from './createDefaultApp.model.js';
-import type { BackendApplication } from './server.model.js';
+import type { BackendApplication } from '../server/server.model.js';
+import { type DefaultAppCfg } from './createDefaultApp.js';
+export declare class BackendServer {
+    private cfg;
+    constructor(cfg: StartServerCfg);
+    server?: Server;
+    start(): Promise<StartServerData>;
+    /**
+     * Gracefully shuts down the server.
+     * Does `process.exit()` in the end.
+     */
+    stop(reason: string): Promise<void>;
+}
+/**
+ * Convenience function.
+ */
+export declare function startServer(cfg: StartServerCfg): Promise<StartServerData>;
 /**
  * If DefaultAppCfg.resources is passed and `expressApp` is not passed - it will call createDefaultApp(cfg).
  */

package/dist/{server → express}/startServer.js

@@ -1,8 +1,8 @@
 import { __decorate } from "tslib";
 import os from 'node:os';
 import { _Memo, _ms } from '@naturalcycles/js-lib';
-import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib';
-import { createDefaultApp } from '../index.js';
+import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib/colors';
+import { createDefaultApp } from './createDefaultApp.js';
 const { NODE_OPTIONS, APP_ENV } = process.env;
 export class BackendServer {
     cfg;

package/dist/index.d.ts

@@ -1,18 +1,9 @@
-import onFinished from 'on-finished';
-export * from './admin/adminMiddleware.js';
-export * from './admin/base.admin.service.js';
-export * from './admin/firebase.shared.service.js';
-export * from './admin/secureHeaderMiddleware.js';
 export * from './env/env.shared.service.js';
 export * from './sentry/sentry.shared.service.js';
 export * from './server/asyncLocalStorageMiddleware.js';
 export * from './server/basicAuthMiddleware.js';
 export * from './server/bodyParserTimeoutMiddleware.js';
-export * from './server/createDefaultApp.js';
-export * from './server/createDefaultApp.model.js';
-export * from './server/deployInfo.util.js';
 export * from './server/genericErrorMiddleware.js';
-export * from './server/getDefaultRouter.js';
 export * from './server/logMiddleware.js';
 export * from './server/methodOverrideMiddleware.js';
 export * from './server/notFoundMiddleware.js';
@@ -26,10 +17,4 @@ export * from './server/server.model.js';
 export * from './server/serverStatsMiddleware.js';
 export * from './server/serverStatusMiddleware.js';
 export * from './server/simpleRequestLoggerMiddleware.js';
-export * from './server/startServer.js';
-export * from './server/startServer.model.js';
-export * from './server/validation/ajvValidateRequest.js';
-export * from './server/validation/validateRequest.js';
-export * from './server/validation/zodValidateRequest.js';
 export * from './util.js';
-export { onFinished };

package/dist/index.js

@@ -1,18 +1,9 @@
-import onFinished from 'on-finished';
-export * from './admin/adminMiddleware.js';
-export * from './admin/base.admin.service.js';
-export * from './admin/firebase.shared.service.js';
-export * from './admin/secureHeaderMiddleware.js';
 export * from './env/env.shared.service.js';
 export * from './sentry/sentry.shared.service.js';
 export * from './server/asyncLocalStorageMiddleware.js';
 export * from './server/basicAuthMiddleware.js';
 export * from './server/bodyParserTimeoutMiddleware.js';
-export * from './server/createDefaultApp.js';
-export * from './server/createDefaultApp.model.js';
-export * from './server/deployInfo.util.js';
 export * from './server/genericErrorMiddleware.js';
-export * from './server/getDefaultRouter.js';
 export * from './server/logMiddleware.js';
 export * from './server/methodOverrideMiddleware.js';
 export * from './server/notFoundMiddleware.js';
@@ -26,10 +17,4 @@ export * from './server/server.model.js';
 export * from './server/serverStatsMiddleware.js';
 export * from './server/serverStatusMiddleware.js';
 export * from './server/simpleRequestLoggerMiddleware.js';
-export * from './server/startServer.js';
-export * from './server/startServer.model.js';
-export * from './server/validation/ajvValidateRequest.js';
-export * from './server/validation/validateRequest.js';
-export * from './server/validation/zodValidateRequest.js';
 export * from './util.js';
-export { onFinished };

package/dist/onFinished.d.ts

@@ -0,0 +1,2 @@
+import onFinished from 'on-finished';
+export { onFinished };

package/dist/onFinished.js

@@ -0,0 +1,2 @@
+import onFinished from 'on-finished';
+export { onFinished };

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

@@ -1,6 +1,6 @@
 import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib';
 import { _inspect } from '@naturalcycles/nodejs-lib';
-import { getRequestLogger } from '../index.js';
+import { getRequestLogger } from '../server/asyncLocalStorageMiddleware.js';
 const sentrySeverityMap = {
     debug: 'log',
     info: 'log',

package/dist/server/bodyParserTimeoutMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { BackendRequestHandler } from '../index.js';
+import type { BackendRequestHandler } from './server.model.js';
 export interface BodyParserTimeoutMiddlewareCfg {
     /**
      * @default 10

package/dist/server/bodyParserTimeoutMiddleware.js

@@ -1,5 +1,5 @@
 import { AppError } from '@naturalcycles/js-lib';
-import { respondWithError } from '../index.js';
+import { respondWithError } from './genericErrorMiddleware.js';
 const code = 'BODY_PARSER_TIMEOUT';
 /**
  * Should be called BEFORE bodyParser

package/dist/server/logMiddleware.js

@@ -1,5 +1,6 @@
 import { inspect } from 'node:util';
-import { _inspect, dimGrey } from '@naturalcycles/nodejs-lib';
+import { _inspect } from '@naturalcycles/nodejs-lib';
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors';
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE, K_SERVICE, APP_ENV } = process.env;
 const isGAE = !!GAE_INSTANCE;
 const isCloudRun = !!K_SERVICE;

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

@@ -1,4 +1,4 @@
-import { boldGrey, green, red, yellow } from '@naturalcycles/nodejs-lib';
+import { boldGrey, green, red, yellow } from '@naturalcycles/nodejs-lib/colors';
 export function logRequestWithColors(req, statusCode, ...tokens) {
     req[logLevel(statusCode)]([coloredHttpCode(statusCode), req.method, boldGrey(req.url), ...tokens].join(' '));
 }

package/dist/server/requestLoggerMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { BackendRequest, BackendRequestHandler } from '../index.js';
+import type { BackendRequest, BackendRequestHandler } from './server.model.js';
 export interface RequestLoggerMiddlewareCfg {
     /**
      * If set - this prefix will be removed from the request url before logging.

package/dist/server/requestLoggerMiddleware.js

@@ -1,5 +1,5 @@
 import { _since } from '@naturalcycles/js-lib';
-import { onFinished } from '../index.js';
+import { onFinished } from '../onFinished.js';
 /**
  * Experimental request logger for Cloud Run.
  *

package/dist/server/requestTimeoutMiddleware.d.ts

@@ -1,5 +1,5 @@
 import type { NumberOfSeconds } from '@naturalcycles/js-lib';
-import type { BackendRequest, BackendRequestHandler, BackendResponse } from '../index.js';
+import type { BackendRequest, BackendRequestHandler, BackendResponse } from './server.model.js';
 export interface RequestTimeoutMiddlewareCfg {
     /**
      * @default 120

package/dist/server/requestTimeoutMiddleware.js

@@ -1,5 +1,7 @@
 import { _ms, AppError } from '@naturalcycles/js-lib';
-import { getRequestEndpoint, onFinished, respondWithError } from '../index.js';
+import { onFinished } from '../onFinished.js';
+import { respondWithError } from './genericErrorMiddleware.js';
+import { getRequestEndpoint } from './request.util.js';
 const code = 'REQUEST_TIMEOUT';
 const REQUEST_TIMEOUT_QUERY_KEY = 'requestTimeout';
 export function requestTimeoutMiddleware(cfg = {}) {

package/dist/server/serverStatsMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { BackendRequestHandler } from '../index.js';
+import type { BackendRequestHandler } from './server.model.js';
 /**
  * Depends on serverStatsMiddleware to work.
  *

package/dist/server/serverStatsMiddleware.js

@@ -1,5 +1,5 @@
 import { _get, _mapValues, _mb, _ms, _percentile, _sortBy, _stringMapEntries, _stringMapValues, _sum, NumberStack, } from '@naturalcycles/js-lib';
-import { onFinished } from '../index.js';
+import { onFinished } from '../onFinished.js';
 import { getRequestEndpoint } from './request.util.js';
 const { GAE_INSTANCE } = process.env;
 const serverStatsMap = {};
@@ -20,7 +20,7 @@ export const serverStatsHTMLHandler = (req, res) => {
     // calc things
     _stringMapValues(serverStatsMap).forEach(s => {
         s.total = s['2xx'] + s['4xx'] + s['5xx'];
-        s.pc = _mapValues(s.stack.percentiles(percentiles), (_k, v) => Math.round(v), true);
+        s.pc = _mapValues(s.stack.percentiles(percentiles), (_k, v) => Math.round(v), { mutate: true });
     });
     const allLatencies = _stringMapValues(serverStatsMap).flatMap(s => s.stack.items);
     const all2xx = _sum(_stringMapValues(serverStatsMap).flatMap(s => s['2xx']));
@@ -49,7 +49,9 @@ export const serverStatsHTMLHandler = (req, res) => {
         `<td align="right"><pre>${all5xx}</pre></td>`,
         ...percentiles.map(pc => `<td align="right"><pre>${Math.round(_percentile(allLatencies, pc))}</pre></td>`),
         `</tr>`,
-        ..._sortBy(_stringMapEntries(serverStatsMap), ([_, stat]) => _get(stat, sortBy), false, asc ? 'asc' : 'desc').map(([endpoint, stat]) => {
+        ..._sortBy(_stringMapEntries(serverStatsMap), ([_, stat]) => _get(stat, sortBy), {
+            dir: asc ? 'asc' : 'desc',
+        }).map(([endpoint, stat]) => {
             return [
                 '<tr>',
                 `<td><pre>${endpoint}</pre></td>`,

package/dist/server/serverStatusMiddleware.js

@@ -1,6 +1,6 @@
 import { _filterNullishValues, localTime } from '@naturalcycles/js-lib';
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib';
-import { getDeployInfo } from './deployInfo.util.js';
+import { getDeployInfo } from '../deploy/deployInfo.util.js';
 const { versions, arch, platform } = process;
 const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, GOOGLE_CLOUD_PROJECT, K_SERVICE, K_REVISION, APP_ENV, NODE_OPTIONS, DEPLOY_BUILD_TIME, } = process.env;
 export function serverStatusMiddleware(projectDir, extra) {

package/dist/server/simpleRequestLoggerMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { BackendRequestHandler } from '../index.js';
+import type { BackendRequestHandler } from './server.model.js';
 export interface SimpleRequestLoggerMiddlewareCfg {
     /**
      * @default false

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -1,6 +1,6 @@
 import { _since } from '@naturalcycles/js-lib';
-import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib';
-import { onFinished } from '../index.js';
+import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors';
+import { onFinished } from '../onFinished.js';
 import { logRequestWithColors } from './request.log.util.js';
 export function simpleRequestLoggerMiddleware(cfg = {}) {
     const { logStart = false, logFinish = true } = cfg;

package/dist/testing/express.test.service.d.ts

@@ -1,6 +1,6 @@
 import type { Fetcher, FetcherOptions } from '@naturalcycles/js-lib';
-import type { BackendApplication, DefaultAppCfg } from '../index.js';
-import type { BackendRequestHandlerCfg } from '../server/createDefaultApp.model.js';
+import { type BackendRequestHandlerCfg, type DefaultAppCfg } from '../express/createDefaultApp.js';
+import type { BackendApplication } from '../server/server.model.js';
 export interface ExpressApp extends Fetcher, AsyncDisposable {
     close: () => Promise<void>;
 }

package/dist/testing/express.test.service.js

@@ -1,5 +1,5 @@
 import { getFetcher, pDelay } from '@naturalcycles/js-lib';
-import { createDefaultApp } from '../index.js';
+import { createDefaultApp, } from '../express/createDefaultApp.js';
 const nativeFetchFn = async (url, init) => await globalThis.fetch(url, init);
 // Example:
 // const app = expressTestService.createApp([ debugResource ])

package/dist/{server/validation → validation/ajv}/ajvValidateRequest.d.ts

@@ -1,6 +1,6 @@
 import type { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib/ajv';
-import type { BackendRequest } from '../server.model.js';
-import type { ReqValidationOptions } from './validateRequest.js';
+import type { BackendRequest } from '../../server/server.model.js';
+import type { ReqValidationOptions } from '../joi/joiValidateRequest.js';
 declare class AjvValidateRequest {
     body<T>(req: BackendRequest, schema: AjvSchema<T>, opt?: ReqValidationOptions<AjvValidationError>): T;
     query<T>(req: BackendRequest, schema: AjvSchema<T>, opt?: ReqValidationOptions<AjvValidationError>): T;

package/dist/{server/validation/validateRequest.d.ts → validation/joi/joiValidateRequest.d.ts}

@@ -1,5 +1,5 @@
 import type { AnySchema, JoiValidationError } from '@naturalcycles/nodejs-lib/joi';
-import type { BackendRequest } from '../server.model.js';
+import type { BackendRequest } from '../../server/server.model.js';
 export interface ReqValidationOptions<ERR extends Error> {
     /**
      * Pass a 'dot-paths' (e.g `pw`, or `input.pw`) that needs to be redacted from the output, in case of error.

package/dist/{server/validation → validation/zod}/zodValidateRequest.d.ts

@@ -1,6 +1,6 @@
 import { type ZodType, type ZodValidationError } from '@naturalcycles/js-lib/zod';
-import type { BackendRequest } from '../server.model.js';
-import type { ReqValidationOptions } from './validateRequest.js';
+import type { BackendRequest } from '../../server/server.model.js';
+import type { ReqValidationOptions } from '../joi/joiValidateRequest.js';
 declare class ZodValidateRequest {
     body<T>(req: BackendRequest, schema: ZodType<T>, opt?: ReqValidationOptions<ZodValidationError>): T;
     query<T>(req: BackendRequest, schema: ZodType<T>, opt?: ReqValidationOptions<ZodValidationError>): T;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.13.0",
+  "version": "9.15.0",
   "peerDependencies": {
     "@sentry/node": "^9"
   },
@@ -34,7 +34,16 @@
   "exports": {
     "./cfg/tsconfig.json": "./cfg/tsconfig.json",
     ".": "./dist/index.js",
-    "./db": "./dist/db/index.js"
+    "./db": "./dist/db/index.js",
+    "./deploy": "./dist/deploy/index.js",
+    "./express/createDefaultApp": "./dist/express/createDefaultApp.js",
+    "./express/getDefaultRouter": "./dist/express/getDefaultRouter.js",
+    "./express/startServer": "./dist/express/startServer.js",
+    "./ajvValidateRequest": "./dist/validation/ajv/ajvValidateRequest.js",
+    "./joiValidateRequest": "./dist/validation/joi/joiValidateRequest.js",
+    "./zodValidateRequest": "./dist/validation/zod/zodValidateRequest.js",
+    "./onFinished": "./dist/onFinished.js",
+    "./testing": "./dist/testing/index.js"
   },
   "files": [
     "dist",

package/src/admin/adminMiddleware.ts

@@ -1,6 +1,5 @@
 import { _memoFn, AppError } from '@naturalcycles/js-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import ejs from 'ejs'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import { srcDir } from '../paths.cnst.js'
 import type { BackendRequestHandler } from '../server/server.model.js'
 import type { BaseAdminService } from './base.admin.service.js'
@@ -89,9 +88,9 @@ export function loginHtml(firebaseServiceCfg: FirebaseSharedServiceCfg): Backend
     adminAuthProvider: firebaseAuthProvider = 'GoogleAuthProvider',
   } = firebaseServiceCfg
 
-  return (_req, res) => {
+  return async (_req, res) => {
     res.send(
-      getLoginHtml({
+      await getLoginHtml({
         firebaseApiKey,
         firebaseAuthDomain,
         firebaseAuthProvider,
@@ -100,9 +99,10 @@ export function loginHtml(firebaseServiceCfg: FirebaseSharedServiceCfg): Backend
   }
 }
 
-const getLoginHtml = _memoFn((cfg: LoginHtmlCfg) => {
+const getLoginHtml = _memoFn(async (cfg: LoginHtmlCfg) => {
   console.log(`reading login.html`)
   const tmpl = fs2.readText(`${srcDir}/admin/login.html`)
+  const { default: ejs } = await import('ejs')
   return ejs.render(tmpl, cfg)
 })
 

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

@@ -1,5 +1,5 @@
 import { _assert, AppError } from '@naturalcycles/js-lib'
-import { dimGrey, green, red } from '@naturalcycles/nodejs-lib'
+import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors'
 import type FirebaseAdmin from 'firebase-admin'
 import type { BackendRequest, BackendRequestHandler } from '../server/server.model.js'
 

package/src/admin/index.ts

@@ -0,0 +1,4 @@
+export * from './adminMiddleware.js'
+export * from './base.admin.service.js'
+export * from './firebase.shared.service.js'
+export * from './secureHeaderMiddleware.js'

package/src/db/httpDBRequestHandler.ts

@@ -12,9 +12,9 @@ import {
   objectSchema,
   stringSchema,
 } from '@naturalcycles/nodejs-lib/joi'
-import { getDefaultRouter } from '../server/getDefaultRouter.js'
+import { getDefaultRouter } from '../express/getDefaultRouter.js'
 import type { BackendRouter } from '../server/server.model.js'
-import { validateRequest } from '../server/validation/validateRequest.js'
+import { validateRequest } from '../validation/joi/joiValidateRequest.js'
 
 export interface GetByIdsInput {
   table: string