@naturalcycles/backend-lib 8.0.4 → 9.0.0

package/src/server/okMiddleware.ts

@@ -1,4 +1,4 @@
-import type { BackendRequestHandler } from './server.model'
+import type { BackendRequestHandler } from './server.model.js'
 
 export function okMiddleware(): BackendRequestHandler {
   return (_req, res) => {

package/src/server/request.log.util.ts

@@ -1,6 +1,6 @@
 import type { CommonLogLevel } from '@naturalcycles/js-lib'
 import { boldGrey, green, red, yellow } from '@naturalcycles/nodejs-lib'
-import type { BackendRequest } from './server.model'
+import type { BackendRequest } from './server.model.js'
 
 export function logRequest(req: BackendRequest, statusCode: number, ...tokens: any[]): void {
   req[logLevel(statusCode)](

package/src/server/request.util.ts

@@ -1,4 +1,4 @@
-import type { BackendRequest } from './server.model'
+import type { BackendRequest } from './server.model.js'
 
 /**
  * Returns e.g:

package/src/server/requestTimeoutMiddleware.ts

@@ -1,7 +1,7 @@
 import type { NumberOfSeconds } from '@naturalcycles/js-lib'
 import { _ms, AppError } from '@naturalcycles/js-lib'
-import type { BackendRequest, BackendRequestHandler, BackendResponse } from '../index'
-import { getRequestEndpoint, onFinished, respondWithError } from '../index'
+import type { BackendRequest, BackendRequestHandler, BackendResponse } from '../index.js'
+import { getRequestEndpoint, onFinished, respondWithError } from '../index.js'
 
 export interface RequestTimeoutMiddlewareCfg {
   /**

package/src/server/safeJsonMiddleware.ts

@@ -1,5 +1,5 @@
 import { _safeJsonStringify } from '@naturalcycles/js-lib'
-import type { BackendRequestHandler, BackendResponse } from './server.model'
+import type { BackendRequestHandler, BackendResponse } from './server.model.js'
 
 /**
  * Replaces express's built-in req.json() function with the safe one,

package/src/server/serverStatsMiddleware.ts

@@ -11,9 +11,9 @@ import {
   _sum,
   NumberStack,
 } from '@naturalcycles/js-lib'
-import type { BackendRequestHandler } from '../index'
-import { onFinished } from '../index'
-import { getRequestEndpoint } from './request.util'
+import type { BackendRequestHandler } from '../index.js'
+import { onFinished } from '../index.js'
+import { getRequestEndpoint } from './request.util.js'
 
 const { GAE_INSTANCE } = process.env
 

package/src/server/serverStatusMiddleware.ts

@@ -1,7 +1,7 @@
 import { _filterNullishValues, localTime } from '@naturalcycles/js-lib'
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib'
-import { getDeployInfo } from './deployInfo.util'
-import type { BackendRequestHandler } from './server.model'
+import { getDeployInfo } from './deployInfo.util.js'
+import type { BackendRequestHandler } from './server.model.js'
 
 const { versions, arch, platform } = process
 const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, K_SERVICE, K_REVISION, APP_ENV, NODE_OPTIONS } =

package/src/server/simpleRequestLoggerMiddleware.ts

@@ -1,9 +1,9 @@
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib'
 import { _since } from '@naturalcycles/js-lib'
 import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib'
-import type { BackendRequestHandler } from '../index'
-import { onFinished } from '../index'
-import { logRequest } from './request.log.util'
+import type { BackendRequestHandler } from '../index.js'
+import { onFinished } from '../index.js'
+import { logRequest } from './request.log.util.js'
 
 const { APP_ENV } = process.env
 

package/src/server/startServer.model.ts

@@ -1,7 +1,7 @@
 import type { Server } from 'node:http'
-import type { SentrySharedService } from '../sentry/sentry.shared.service'
-import type { DefaultAppCfg } from './createDefaultApp.model'
-import type { BackendApplication } from './server.model'
+import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
+import type { DefaultAppCfg } from './createDefaultApp.model.js'
+import type { BackendApplication } from './server.model.js'
 
 /**
  * If DefaultAppCfg.resources is passed and `expressApp` is not passed - it will call createDefaultApp(cfg).

package/src/server/startServer.ts

@@ -2,8 +2,8 @@ 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'
-import type { StartServerCfg, StartServerData } from './startServer.model'
+import { createDefaultApp } from '../index.js'
+import type { StartServerCfg, StartServerData } from './startServer.model.js'
 
 const { NODE_OPTIONS, APP_ENV } = process.env
 
@@ -13,11 +13,8 @@ export class BackendServer {
   server?: Server
 
   async start(): Promise<StartServerData> {
-    const {
-      port: cfgPort,
-      expressApp = createDefaultApp(this.cfg),
-      registerUncaughtExceptionHandlers = true,
-    } = this.cfg
+    const { port: cfgPort, registerUncaughtExceptionHandlers = true } = this.cfg
+    const expressApp = this.cfg.expressApp || (await createDefaultApp(this.cfg))
 
     // 1. Register error handlers, etc.
     if (registerUncaughtExceptionHandlers) {

package/src/server/validation/validateMiddleware.ts

@@ -2,8 +2,8 @@ import type { JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib'
 import { _get, AppError } from '@naturalcycles/js-lib'
 import type { AjvValidationError } from '@naturalcycles/nodejs-lib'
 import { AjvSchema } from '@naturalcycles/nodejs-lib'
-import type { BackendRequestHandler } from '../server.model'
-import type { ReqValidationOptions } from './validateRequest'
+import type { BackendRequestHandler } from '../server.model.js'
+import type { ReqValidationOptions } from './validateRequest.js'
 
 const REDACTED = 'REDACTED'
 

package/src/server/validation/validateRequest.ts

@@ -1,7 +1,7 @@
 import { _get, AppError } from '@naturalcycles/js-lib'
 import type { AnySchema, JoiValidationError } from '@naturalcycles/nodejs-lib'
 import { getValidationResult } from '@naturalcycles/nodejs-lib'
-import type { BackendRequest } from '../server.model'
+import type { BackendRequest } from '../server.model.js'
 
 const REDACTED = 'REDACTED'
 

package/src/server/validation/zodValidateMiddleware.ts

@@ -1,8 +1,8 @@
 import { _get, AppError } from '@naturalcycles/js-lib'
 import type { ZodSchema, ZodValidationError } from '@naturalcycles/js-lib/dist/zod/index.js'
 import { zSafeValidate } from '@naturalcycles/js-lib/dist/zod/index.js'
-import type { BackendRequestHandler } from '../server.model'
-import type { ReqValidationOptions } from './validateRequest'
+import type { BackendRequestHandler } from '../server.model.js'
+import type { ReqValidationOptions } from './validateRequest.js'
 
 const REDACTED = 'REDACTED'
 

package/src/testing/express.test.service.ts

@@ -2,13 +2,13 @@ import type { Server } from 'node:http'
 import type { AddressInfo } from 'node:net'
 import type { Fetcher, FetcherOptions, FetchFunction } from '@naturalcycles/js-lib'
 import { getFetcher, pDelay } from '@naturalcycles/js-lib'
-import type { BackendApplication, DefaultAppCfg } from '../index'
-import { createDefaultApp } from '../index'
-import type { BackendRequestHandlerCfg } from '../server/createDefaultApp.model'
+import type { BackendApplication, DefaultAppCfg } from '../index.js'
+import { createDefaultApp } from '../index.js'
+import type { BackendRequestHandlerCfg } from '../server/createDefaultApp.model.js'
 
 const nativeFetchFn: FetchFunction = async (url, init) => await globalThis.fetch(url, init)
 
-export interface ExpressApp extends Fetcher {
+export interface ExpressApp extends Fetcher, AsyncDisposable {
   close: () => Promise<void>
 }
 
@@ -19,13 +19,13 @@ export interface ExpressApp extends Fetcher {
 // })
 
 class ExpressTestService {
-  createAppFromResource(
+  async createAppFromResource(
     resource: BackendRequestHandlerCfg,
     opt?: FetcherOptions,
     defaultAppCfg?: DefaultAppCfg,
-  ): ExpressApp {
+  ): Promise<ExpressApp> {
     return this.createApp(
-      createDefaultApp({
+      await createDefaultApp({
         ...defaultAppCfg,
         resources: [resource],
       }),
@@ -33,9 +33,12 @@ class ExpressTestService {
     )
   }
 
-  createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: FetcherOptions): ExpressApp {
+  async createAppFromResources(
+    resources: BackendRequestHandlerCfg[],
+    opt?: FetcherOptions,
+  ): Promise<ExpressApp> {
     return this.createApp(
-      createDefaultApp({
+      await createDefaultApp({
         resources,
       }),
       opt,
@@ -70,10 +73,16 @@ class ExpressTestService {
       // console.log(`close took ${_since(started)}`) // todo: investigate why it takes ~5 seconds!
       // Kirill: not awaiting the server-close, otherwise it takes significant waiting time
       // to "teardown" server after it's been hit by Fetcher
-      server.close()
-      // server.destroy()
+      // server.close()
+      // 2024-08-31: server.close is no longer slow, so now we're back at awaiting it
+      await new Promise(resolve => {
+        server.unref().close(resolve)
+      })
+      await pDelay()
     }
 
+    fetcher[Symbol.asyncDispose] = async () => await fetcher.close()
+
     return fetcher
   }
 

package/src/testing/index.ts

@@ -1,5 +1,5 @@
-import type { ExpressApp } from './express.test.service'
-import { expressTestService } from './express.test.service'
+import type { ExpressApp } from './express.test.service.js'
+import { expressTestService } from './express.test.service.js'
 
 export type { ExpressApp }