@naturalcycles/backend-lib 9.14.0 → 9.16.0

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 { _since } from '@naturalcycles/js-lib/datetime';
+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 { Fetcher, FetcherOptions } from '@naturalcycles/js-lib/http';
+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,6 @@
-import { getFetcher, pDelay } from '@naturalcycles/js-lib';
-import { createDefaultApp } from '../index.js';
+import { getFetcher } from '@naturalcycles/js-lib/http';
+import { pDelay } from '@naturalcycles/js-lib/promise';
+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 → validation/ajv}/ajvValidateRequest.js

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { _get } from '@naturalcycles/js-lib/object';
 class AjvValidateRequest {
     body(req, schema, opt = {}) {
         return this.validate(req, 'body', schema, opt);

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/validateRequest.js → validation/joi/joiValidateRequest.js}

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { _get } from '@naturalcycles/js-lib/object';
 import { getValidationResult } from '@naturalcycles/nodejs-lib/joi';
 class ValidateRequest {
     body(req, schema, opt = {}) {

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/dist/{server/validation → validation/zod}/zodValidateRequest.js

@@ -1,4 +1,5 @@
-import { _get, AppError } from '@naturalcycles/js-lib';
+import { AppError } from '@naturalcycles/js-lib/error';
+import { _get } from '@naturalcycles/js-lib/object';
 import { zSafeValidate } from '@naturalcycles/js-lib/zod';
 class ZodValidateRequest {
     body(req, schema, opt = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.14.0",
+  "version": "9.16.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,6 @@
-import { _memoFn, AppError } from '@naturalcycles/js-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import ejs from 'ejs'
+import { _memoFn } from '@naturalcycles/js-lib/decorators'
+import { AppError } from '@naturalcycles/js-lib/error'
+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 +89,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 +100,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 { _assert, AppError } from '@naturalcycles/js-lib/error'
+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/firebase.shared.service.ts

@@ -1,4 +1,4 @@
-import { _Memo } from '@naturalcycles/js-lib'
+import { _Memo } from '@naturalcycles/js-lib/decorators'
 import type { AppOptions, ServiceAccount } from 'firebase-admin'
 import type FirebaseAdmin from 'firebase-admin'
 

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/admin/secureHeaderMiddleware.ts

@@ -1,4 +1,4 @@
-import { AppError } from '@naturalcycles/js-lib'
+import { AppError } from '@naturalcycles/js-lib/error'
 import { timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
 import type { BackendRequestHandler } from '../server/server.model.js'
 import type { AdminMiddleware, RequireAdminCfg } from './adminMiddleware.js'

package/src/db/httpDB.ts

@@ -9,13 +9,10 @@ import type {
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib'
-import type {
-  Fetcher,
-  FetcherOptions,
-  JsonSchemaRootObject,
-  ObjectWithId,
-} from '@naturalcycles/js-lib'
-import { getFetcher } from '@naturalcycles/js-lib'
+import type { Fetcher, FetcherOptions } from '@naturalcycles/js-lib/http'
+import { getFetcher } from '@naturalcycles/js-lib/http'
+import type { JsonSchemaRootObject } from '@naturalcycles/js-lib/json-schema'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 
 export interface HttpDBCfg extends FetcherOptions {

package/src/db/httpDBRequestHandler.ts

@@ -1,20 +1,21 @@
 import type { CommonDB, CommonDBOptions, CommonDBSaveOptions } from '@naturalcycles/db-lib'
-import { DBQuery, InMemoryDB } from '@naturalcycles/db-lib'
+import { DBQuery } from '@naturalcycles/db-lib'
+import { InMemoryDB } from '@naturalcycles/db-lib/inmemory'
 import {
   commonDBOptionsSchema,
   commonDBSaveOptionsSchema,
   dbQuerySchema,
 } from '@naturalcycles/db-lib/validation'
-import type { ObjectWithId } from '@naturalcycles/js-lib'
+import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import {
   anyObjectSchema,
   arraySchema,
   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

package/src/deploy/backend.cfg.util.ts

@@ -1,6 +1,7 @@
-import type { StringMap } from '@naturalcycles/js-lib'
+import type { StringMap } from '@naturalcycles/js-lib/types'
 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'
 
 export interface BackendCfg {
@@ -50,7 +51,7 @@ export function getBackendCfg(projectDir = '.'): BackendCfg {
   fs2.requireFileToExist(backendCfgYamlPath)
 
   const backendCfg: BackendCfg = {
-    ...fs2.readYaml(backendCfgYamlPath),
+    ...yaml2.readYaml(backendCfgYamlPath),
   }
 
   backendCfgSchema.validate(backendCfg)

package/src/deploy/deploy.model.ts

@@ -1,4 +1,4 @@
-import type { UnixTimestamp } from '@naturalcycles/js-lib'
+import type { UnixTimestamp } from '@naturalcycles/js-lib/types'
 
 export interface DeployInfo {
   gaeProject: string

package/src/deploy/deploy.util.ts

@@ -1,6 +1,11 @@
-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 { localTime } from '@naturalcycles/js-lib/datetime'
+import { _assert } from '@naturalcycles/js-lib/error'
+import { _mapValues, _merge } from '@naturalcycles/js-lib/object'
+import { _truncate } from '@naturalcycles/js-lib/string'
+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'
 import type { BackendCfg } from './backend.cfg.util.js'
 import type { AppYaml, DeployInfo } from './deploy.model.js'
 
@@ -117,7 +122,7 @@ export function createAndSaveAppYaml(
 ): AppYaml {
   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
 }
@@ -143,13 +148,13 @@ export function createAppYaml(
   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

package/src/deploy/deployGae.ts

@@ -1,6 +1,9 @@
-import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
-import { exec2 } from '@naturalcycles/nodejs-lib'
-import { appendToGithubSummary, fs2 } from '@naturalcycles/nodejs-lib/fs'
+import { _anyToError } from '@naturalcycles/js-lib/error'
+import { pRetry } from '@naturalcycles/js-lib/promise'
+import { _objectAssign } from '@naturalcycles/js-lib/types'
+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 type { DeployHealthCheckOptions } from './deployHealthCheck.js'

package/src/deploy/deployHealthCheck.ts

@@ -1,8 +1,12 @@
 import type { InspectOptions } from 'node:util'
 import { inspect } from 'node:util'
-import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
-import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib'
-import { dimGrey, exec2, red } from '@naturalcycles/nodejs-lib'
+import { _ms, _since } from '@naturalcycles/js-lib/datetime'
+import { getFetcher } from '@naturalcycles/js-lib/http'
+import { _filterFalsyValues } from '@naturalcycles/js-lib/object'
+import { pDelay } from '@naturalcycles/js-lib/promise'
+import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
+import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors'
+import { exec2 } from '@naturalcycles/nodejs-lib/exec2'
 import { coloredHttpCode } from '../server/request.log.util.js'
 
 export interface DeployHealthCheckOptions {

package/src/{server → deploy}/deployInfo.util.ts

@@ -1,6 +1,7 @@
-import { _memoFn, localTime } from '@naturalcycles/js-lib'
-import { fs2 } from '@naturalcycles/nodejs-lib/fs'
-import type { DeployInfo } from '../deploy/index.js'
+import { localTime } from '@naturalcycles/js-lib/datetime'
+import { _memoFn } from '@naturalcycles/js-lib/decorators'
+import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
+import type { DeployInfo } from './deploy.model.js'
 
 export const getDeployInfo = _memoFn((projectDir: string): DeployInfo => {
   const deployInfoPath = `${projectDir}/deployInfo.json`

package/src/deploy/deployPrepare.ts

@@ -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 type { DeployInfo } from './deploy.model.js'

package/src/deploy/index.ts

@@ -17,3 +17,5 @@ export {
   deployPrepare,
   getBackendCfg,
 }
+
+export * from './deployInfo.util.js'

package/src/env/env.shared.service.ts

@@ -1,6 +1,7 @@
-import type { StringMap } from '@naturalcycles/js-lib'
-import { _assert, _by } from '@naturalcycles/js-lib'
-import { dimGrey } from '@naturalcycles/nodejs-lib'
+import { _by } from '@naturalcycles/js-lib'
+import { _assert } from '@naturalcycles/js-lib/error'
+import type { StringMap } from '@naturalcycles/js-lib/types'
+import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 
 export interface BaseEnv {
   name: string

package/src/{server → express}/createDefaultApp.ts

@@ -1,19 +1,17 @@
-import cookieParser from 'cookie-parser'
-import cors from 'cors'
-import express from 'express'
-import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware.js'
-import type {
-  BackendRequestHandlerCfg,
-  BackendRequestHandlerWithPath,
-  DefaultAppCfg,
-} from './createDefaultApp.model.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 type { BackendApplication } from './server.model.js'
-import { simpleRequestLoggerMiddleware } from './simpleRequestLoggerMiddleware.js'
+import type { Options, OptionsJson, OptionsUrlencoded } from 'body-parser'
+import type { CorsOptions } from 'cors'
+import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
+import { asyncLocalStorageMiddleware } from '../server/asyncLocalStorageMiddleware.js'
+import {
+  genericErrorMiddleware,
+  type GenericErrorMiddlewareCfg,
+} 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 type { BackendApplication, BackendRequestHandler } from '../server/server.model.js'
+import { simpleRequestLoggerMiddleware } from '../server/simpleRequestLoggerMiddleware.js'
 
 const isTest = process.env['APP_ENV'] === 'test'
 const isDev = process.env['APP_ENV'] === 'dev'
@@ -21,6 +19,10 @@ const isDev = process.env['APP_ENV'] === 'dev'
 export async function createDefaultApp(cfg: DefaultAppCfg): Promise<BackendApplication> {
   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')
@@ -143,3 +145,39 @@ function useHandlers(app: BackendApplication, handlers: BackendRequestHandlerCfg
       app.use(cfg.path, cfg.handler)
     })
 }
+
+/**
+ * Plain RequestHandler can be provided - then it's mounted to /
+ * Otherwise `path` can be provided to specify mounting point.
+ */
+export type BackendRequestHandlerCfg = BackendRequestHandler | BackendRequestHandlerWithPath
+
+export interface BackendRequestHandlerWithPath {
+  path: string
+  handler: BackendRequestHandler
+}
+
+/**
+ * Handlers are used in this order:
+ *
+ * 1. preHandlers
+ * 2. handlers
+ * 3. resources
+ * 4. postHandlers
+ */
+export interface DefaultAppCfg {
+  preHandlers?: BackendRequestHandlerCfg[]
+  handlers?: BackendRequestHandlerCfg[]
+  resources?: BackendRequestHandlerCfg[]
+  postHandlers?: BackendRequestHandlerCfg[]
+
+  sentryService?: SentrySharedService
+
+  bodyParserJsonOptions?: OptionsJson
+  bodyParserUrlEncodedOptions?: OptionsUrlencoded
+  bodyParserRawOptions?: Options
+
+  corsOptions?: CorsOptions
+
+  genericErrorMwCfg?: GenericErrorMiddlewareCfg
+}

package/src/{server → express}/getDefaultRouter.ts

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

package/src/{server → express}/startServer.ts

@@ -1,9 +1,11 @@
 import type { Server } from 'node:http'
 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 type { StartServerCfg, StartServerData } from './startServer.model.js'
+import { _ms } from '@naturalcycles/js-lib/datetime'
+import { _Memo } from '@naturalcycles/js-lib/decorators'
+import { boldGrey, dimGrey, white } from '@naturalcycles/nodejs-lib/colors'
+import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
+import type { BackendApplication } from '../server/server.model.js'
+import { createDefaultApp, type DefaultAppCfg } from './createDefaultApp.js'
 
 const { NODE_OPTIONS, APP_ENV } = process.env
 
@@ -124,3 +126,43 @@ export async function startServer(cfg: StartServerCfg): Promise<StartServerData>
     throw err
   }
 }
+
+/**
+ * If DefaultAppCfg.resources is passed and `expressApp` is not passed - it will call createDefaultApp(cfg).
+ */
+export interface StartServerCfg extends DefaultAppCfg {
+  /**
+   * @default process.env.PORT || 8080
+   */
+  port?: number
+
+  expressApp?: BackendApplication
+
+  /**
+   * Server will wait for promise to resolve until shutting down.
+   * (with a timeout)
+   */
+  onShutdown?: () => Promise<void>
+
+  /**
+   * @default 3000
+   */
+  forceShutdownTimeout?: number
+
+  sentryService?: SentrySharedService
+
+  /**
+   * Defaults to true.
+   * Set to false if you already have your handlers elsewhere and don't need them here.
+   */
+  registerUncaughtExceptionHandlers?: boolean
+}
+
+export interface StartServerData {
+  port: number
+  server: Server
+  /**
+   * "Processed" server.address() as a string, ready to Cmd+click in MacOS Terminal
+   */
+  address: string
+}

package/src/index.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,11 +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/src/onFinished.ts

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

package/src/sentry/sentry.shared.service.ts

@@ -1,10 +1,11 @@
-import type { CommonLogger, CommonLogLevel, Primitive, StringMap } from '@naturalcycles/js-lib'
-import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib'
+import { _anyToError, _isErrorObject } from '@naturalcycles/js-lib/error'
+import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
+import type { Primitive, StringMap } from '@naturalcycles/js-lib/types'
 import type { InspectAnyOptions } from '@naturalcycles/nodejs-lib'
 import { _inspect } from '@naturalcycles/nodejs-lib'
 import type { Breadcrumb, SeverityLevel } from '@sentry/node'
 import type * as SentryLib from '@sentry/node'
-import { getRequestLogger } from '../index.js'
+import { getRequestLogger } from '../server/asyncLocalStorageMiddleware.js'
 
 export interface SentrySharedServiceCfg {
   sentry: typeof SentryLib

package/src/server/asyncLocalStorageMiddleware.ts

@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
-import type { CommonLogger } from '@naturalcycles/js-lib'
 import { _lazyValue } from '@naturalcycles/js-lib'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { ciLogger, devLogger, gcpStructuredLogger } from './logMiddleware.js'
 import type { BackendRequest, BackendRequestHandler } from './server.model.js'
 

package/src/server/basicAuthMiddleware.ts

@@ -1,5 +1,5 @@
-import type { StringMap } from '@naturalcycles/js-lib'
-import { _split } from '@naturalcycles/js-lib'
+import { _split } from '@naturalcycles/js-lib/string'
+import type { StringMap } from '@naturalcycles/js-lib/types'
 import { base64ToString, timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
 import type { BackendRequestHandler } from './server.model.js'
 

package/src/server/bodyParserTimeoutMiddleware.ts

@@ -1,6 +1,6 @@
-import { AppError } from '@naturalcycles/js-lib'
-import type { BackendRequestHandler } from '../index.js'
-import { respondWithError } from '../index.js'
+import { AppError } from '@naturalcycles/js-lib/error'
+import { respondWithError } from './genericErrorMiddleware.js'
+import type { BackendRequestHandler } from './server.model.js'
 
 export interface BodyParserTimeoutMiddlewareCfg {
   /**

package/src/server/genericErrorMiddleware.ts

@@ -1,9 +1,6 @@
-import {
-  _objectAssign,
-  type BackendErrorResponseObject,
-  type ErrorObject,
-} from '@naturalcycles/js-lib'
-import { _anyToError, _errorLikeToErrorObject } from '@naturalcycles/js-lib'
+import type { BackendErrorResponseObject, ErrorObject } from '@naturalcycles/js-lib/error'
+import { _anyToError, _errorLikeToErrorObject } from '@naturalcycles/js-lib/error'
+import { _objectAssign } from '@naturalcycles/js-lib/types'
 import type { BackendErrorRequestHandler, BackendRequest, BackendResponse } from './server.model.js'
 
 export interface GenericErrorMiddlewareCfg {