@naturalcycles/backend-lib 8.0.4 → 9.0.0

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

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressTestService = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
-const index_1 = require("../index");
+import { getFetcher, pDelay } from '@naturalcycles/js-lib';
+import { createDefaultApp } from '../index.js';
 const nativeFetchFn = async (url, init) => await globalThis.fetch(url, init);
 // Example:
 // const app = expressTestService.createApp([ debugResource ])
@@ -10,14 +7,14 @@ const nativeFetchFn = async (url, init) => await globalThis.fetch(url, init);
 //   await app.close()
 // })
 class ExpressTestService {
-    createAppFromResource(resource, opt, defaultAppCfg) {
-        return this.createApp((0, index_1.createDefaultApp)({
+    async createAppFromResource(resource, opt, defaultAppCfg) {
+        return this.createApp(await createDefaultApp({
             ...defaultAppCfg,
             resources: [resource],
         }), opt);
     }
-    createAppFromResources(resources, opt) {
-        return this.createApp((0, index_1.createDefaultApp)({
+    async createAppFromResources(resources, opt) {
+        return this.createApp(await createDefaultApp({
             resources,
         }), opt);
     }
@@ -25,7 +22,7 @@ class ExpressTestService {
         const server = this.createTestServer(app);
         const { port } = server.address();
         const baseUrl = `http://127.0.0.1:${port}`;
-        const fetcher = (0, js_lib_1.getFetcher)({
+        const fetcher = getFetcher({
             baseUrl,
             responseType: 'json',
             retry: { count: 0 },
@@ -39,7 +36,7 @@ class ExpressTestService {
             // so tests using it can reply on `void someAnalyticsService.doSmth()` promises
             // to be done by that time.
             // Smart, huh?
-            await (0, js_lib_1.pDelay)();
+            await pDelay();
         });
         fetcher.close = async () => {
             // const started = Date.now()
@@ -47,9 +44,14 @@ 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;
     }
     /**
@@ -70,4 +72,4 @@ class ExpressTestService {
         return server;
     }
 }
-exports.expressTestService = new ExpressTestService();
+export const expressTestService = new ExpressTestService();

package/dist/testing/index.d.ts

@@ -1,4 +1,4 @@
-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 };
 export { expressTestService };

package/dist/testing/index.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressTestService = void 0;
-const express_test_service_1 = require("./express.test.service");
-Object.defineProperty(exports, "expressTestService", { enumerable: true, get: function () { return express_test_service_1.expressTestService; } });
+import { expressTestService } from './express.test.service.js';
+export { expressTestService };

package/dist/util.js

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

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "8.0.4",
+  "type": "module",
+  "version": "9.0.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -11,11 +12,11 @@
     "dev": "APP_ENV=dev tsx watch src/test/server/server.ts",
     "docs-serve": "NODE_OPTIONS=--openssl-legacy-provider vuepress dev docs",
     "docs-build": "NODE_OPTIONS=--openssl-legacy-provider vuepress build docs",
-    "deploy-gae": "yarn tsx ./src/bin/deploy-gae.ts",
-    "deploy-prepare": "yarn tsx ./src/bin/deploy-prepare.ts",
-    "deploy-prepare-debug": "AA=AA1 BB=BB1 yarn tsx ./src/bin/deploy-prepare.ts --projectDir ./src/test/project",
-    "deploy-health-check-debug1": "yarn tsx ./src/bin/deploy-health-check.ts --url https://api-master.naturalcycles.com",
-    "deploy-health-check-debug2": "yarn tsx ./src/bin/deploy-health-check.ts --url https://api-master2.naturalcycles.com --thresholdUnhealthy 5"
+    "deploy-gae": "yarn tsx src/bin/deploy-gae.ts",
+    "deploy-prepare": "yarn tsx src/bin/deploy-prepare.ts",
+    "deploy-prepare-debug": "AA=AA1 BB=BB1 yarn tsx src/bin/deploy-prepare.ts --projectDir ./src/test/project",
+    "deploy-health-check-debug1": "yarn tsx src/bin/deploy-health-check.ts --url https://api-master.naturalcycles.com",
+    "deploy-health-check-debug2": "yarn tsx src/bin/deploy-health-check.ts --url https://api-master2.naturalcycles.com --thresholdUnhealthy 5"
   },
   "peerDependencies": {
     "@sentry/node": "^9"
@@ -77,7 +78,6 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "type": "commonjs",
   "description": "Standard library for making Express.js / AppEngine based backend services",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/admin/adminMiddleware.ts

@@ -1,9 +1,9 @@
 import { _memoFn, AppError } from '@naturalcycles/js-lib'
 import { fs2 } from '@naturalcycles/nodejs-lib'
 import ejs from 'ejs'
-import type { BackendRequestHandler } from '../server/server.model'
-import type { BaseAdminService } from './base.admin.service'
-import type { FirebaseSharedServiceCfg } from './firebase.shared.service'
+import type { BackendRequestHandler } from '../server/server.model.js'
+import type { BaseAdminService } from './base.admin.service.js'
+import type { FirebaseSharedServiceCfg } from './firebase.shared.service.js'
 
 export interface RequireAdminCfg {
   /**

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

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

package/src/admin/firebase.shared.service.ts

@@ -39,16 +39,16 @@ export interface FirebaseSharedServiceCfg {
 export class FirebaseSharedService {
   constructor(public cfg: FirebaseSharedServiceCfg) {}
 
-  init(): void {
-    this.admin()
+  async init(): Promise<void> {
+    await this.admin()
   }
 
   @_Memo()
-  admin(): FirebaseAdmin.app.App {
+  async admin(): Promise<FirebaseAdmin.app.App> {
     const { serviceAccount } = this.cfg
 
     // lazy loading
-    const admin = require('firebase-admin') as typeof FirebaseAdmin
+    const admin = await import('firebase-admin')
 
     const credential = serviceAccount
       ? admin.credential.cert(serviceAccount)
@@ -63,7 +63,8 @@ export class FirebaseSharedService {
     )
   }
 
-  auth(): FirebaseAdmin.auth.Auth {
-    return this.admin().auth()
+  async auth(): Promise<FirebaseAdmin.auth.Auth> {
+    const admin = await this.admin()
+    return admin.auth()
   }
 }

package/src/admin/secureHeaderMiddleware.ts

@@ -1,9 +1,9 @@
 import { AppError } from '@naturalcycles/js-lib'
 import { timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
-import type { BackendRequestHandler } from '../server/server.model'
-import type { AdminMiddleware, RequireAdminCfg } from './adminMiddleware'
-import { requireAdminPermissions } from './adminMiddleware'
-import type { BaseAdminService } from './base.admin.service'
+import type { BackendRequestHandler } from '../server/server.model.js'
+import type { AdminMiddleware, RequireAdminCfg } from './adminMiddleware.js'
+import { requireAdminPermissions } from './adminMiddleware.js'
+import type { BaseAdminService } from './base.admin.service.js'
 
 export interface SecureHeaderMiddlewareCfg extends RequireAdminCfg {
   adminService: BaseAdminService

package/src/bin/deploy-gae.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 import { _yargs, runScript } from '@naturalcycles/nodejs-lib'
-import { deployGae } from '../deploy/deployGae'
-import { deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck'
-import { deployPrepareYargsOptions } from '../deploy/deployPrepare'
+import { deployGae } from '../deploy/deployGae.js'
+import { deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck.js'
+import { deployPrepareYargsOptions } from '../deploy/deployPrepare.js'
 
 runScript(async () => {
   const opt = _yargs().options({

package/src/bin/deploy-health-check.ts

@@ -10,7 +10,7 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
  */
 
 import { _yargs, runScript } from '@naturalcycles/nodejs-lib'
-import { deployHealthCheck, deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck'
+import { deployHealthCheck, deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck.js'
 
 runScript(async () => {
   const { url, ...opt } = _yargs().options({

package/src/bin/deploy-prepare.ts

@@ -7,7 +7,7 @@ yarn deploy-prepare
  */
 
 import { _yargs, runScript } from '@naturalcycles/nodejs-lib'
-import { deployPrepare, deployPrepareYargsOptions } from '../deploy/deployPrepare'
+import { deployPrepare, deployPrepareYargsOptions } from '../deploy/deployPrepare.js'
 
 runScript(async () => {
   const opt = _yargs().options(deployPrepareYargsOptions).argv

package/src/bin/undeploy-gae.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { _yargs, runScript } from '@naturalcycles/nodejs-lib'
-import { undeployGae } from '../deploy/deployGae'
+import { undeployGae } from '../deploy/deployGae.js'
 
 runScript(async () => {
   const { branch } = _yargs().options({

package/src/db/httpDBRequestHandler.ts

@@ -4,11 +4,12 @@ import {
   commonDBOptionsSchema,
   commonDBSaveOptionsSchema,
   dbQuerySchema,
-} from '@naturalcycles/db-lib/dist/validation'
+} from '@naturalcycles/db-lib/dist/validation/index.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib'
 import { anyObjectSchema, arraySchema, objectSchema, stringSchema } from '@naturalcycles/nodejs-lib'
-import type { BackendRouter } from '..'
-import { getDefaultRouter, validateRequest } from '..'
+import { getDefaultRouter } from '../server/getDefaultRouter.js'
+import type { BackendRouter } from '../server/server.model.js'
+import { validateRequest } from '../server/validation/validateRequest.js'
 
 export interface GetByIdsInput {
   table: string

package/src/db/index.ts

@@ -1,6 +1,6 @@
-import type { HttpDBCfg } from './httpDB'
-import { HttpDB } from './httpDB'
-import { httpDBRequestHandler } from './httpDBRequestHandler'
+import type { HttpDBCfg } from './httpDB.js'
+import { HttpDB } from './httpDB.js'
+import { httpDBRequestHandler } from './httpDBRequestHandler.js'
 
 export type { HttpDBCfg }
 

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

@@ -1,6 +1,6 @@
 import type { StringMap } from '@naturalcycles/js-lib'
 import { AjvSchema, fs2, requireFileToExist } from '@naturalcycles/nodejs-lib'
-import { resourcesDir } from '../paths.cnst'
+import { resourcesDir } from '../paths.cnst.js'
 
 export interface BackendCfg {
   gaeProject: string

package/src/deploy/deploy.util.ts

@@ -1,7 +1,7 @@
 import { _assert, _mapValues, _merge, _truncate, localTime } from '@naturalcycles/js-lib'
 import { dimGrey, fs2, sha256, white } from '@naturalcycles/nodejs-lib'
-import type { BackendCfg } from './backend.cfg.util'
-import type { AppYaml, DeployInfo } from './deploy.model'
+import type { BackendCfg } from './backend.cfg.util.js'
+import type { AppYaml, DeployInfo } from './deploy.model.js'
 
 const APP_YAML_DEFAULT = (): AppYaml => ({
   runtime: 'nodejs22',
@@ -37,7 +37,7 @@ export async function createDeployInfo(
   backendCfg: BackendCfg,
   overrideBranch?: string,
 ): Promise<DeployInfo> {
-  const simpleGit = require('simple-git') // lazy load
+  const { simpleGit } = await import('simple-git') // lazy load
   const git = simpleGit('.')
 
   const now = localTime.now()
@@ -153,7 +153,6 @@ export function createAppYaml(
   }
 
   // appYamlPassEnv
-  require('dotenv').config() // ensure .env is read
   const passEnv = appYamlPassEnv
     .split(',')
     .filter(Boolean)

package/src/deploy/deployGae.ts

@@ -1,11 +1,11 @@
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
 import { appendToGithubSummary, exec2 } from '@naturalcycles/nodejs-lib'
-import { getBackendCfg } from './backend.cfg.util'
-import { createDeployInfo } from './deploy.util'
-import type { DeployHealthCheckOptions } from './deployHealthCheck'
-import { deployHealthCheck } from './deployHealthCheck'
-import type { DeployPrepareOptions } from './deployPrepare'
-import { deployPrepare } from './deployPrepare'
+import { getBackendCfg } from './backend.cfg.util.js'
+import { createDeployInfo } from './deploy.util.js'
+import type { DeployHealthCheckOptions } from './deployHealthCheck.js'
+import { deployHealthCheck } from './deployHealthCheck.js'
+import type { DeployPrepareOptions } from './deployPrepare.js'
+import { deployPrepare } from './deployPrepare.js'
 
 export interface DeployGaeOptions extends DeployPrepareOptions, DeployHealthCheckOptions {}
 

package/src/deploy/deployHealthCheck.ts

@@ -3,7 +3,7 @@ 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 { coloredHttpCode } from '../server/request.log.util'
+import { coloredHttpCode } from '../server/request.log.util.js'
 
 export interface DeployHealthCheckOptions {
   thresholdHealthy?: number

package/src/deploy/deployPrepare.ts

@@ -1,8 +1,8 @@
 import { dimGrey, fs2, kpySync } from '@naturalcycles/nodejs-lib'
-import { srcDir } from '../paths.cnst'
-import { getBackendCfg } from './backend.cfg.util'
-import type { DeployInfo } from './deploy.model'
-import { createAndSaveAppYaml, createAndSaveDeployInfo } from './deploy.util'
+import { srcDir } from '../paths.cnst.js'
+import { getBackendCfg } from './backend.cfg.util.js'
+import type { DeployInfo } from './deploy.model.js'
+import { createAndSaveAppYaml, createAndSaveDeployInfo } from './deploy.util.js'
 
 export interface DeployPrepareOptions {
   projectDir?: string
@@ -65,7 +65,8 @@ const DEFAULT_FILES = [
 const defaultFilesDir = `${srcDir}/deploy/files-default`
 
 export async function deployPrepare(opt: DeployPrepareOptions = {}): Promise<DeployInfo> {
-  // lazy load (somehow fixes `yarn test-leaks`)
+  await import('dotenv/config') // ensure .env is loaded
+
   const { projectDir = '.', targetDir = './tmp/deploy', createNpmrc = true } = opt
 
   const backendCfg = getBackendCfg(projectDir)

package/src/deploy/index.ts

@@ -1,11 +1,11 @@
-import type { BackendCfg } from './backend.cfg.util'
-import { getBackendCfg } from './backend.cfg.util'
-import type { DeployInfo } from './deploy.model'
-import { createAppYaml, createDeployInfo } from './deploy.util'
-import { deployGae } from './deployGae'
-import type { DeployHealthCheckOptions } from './deployHealthCheck'
-import { deployHealthCheck } from './deployHealthCheck'
-import { deployPrepare } from './deployPrepare'
+import type { BackendCfg } from './backend.cfg.util.js'
+import { getBackendCfg } from './backend.cfg.util.js'
+import type { DeployInfo } from './deploy.model.js'
+import { createAppYaml, createDeployInfo } from './deploy.util.js'
+import { deployGae } from './deployGae.js'
+import type { DeployHealthCheckOptions } from './deployHealthCheck.js'
+import { deployHealthCheck } from './deployHealthCheck.js'
+import { deployPrepare } from './deployPrepare.js'
 
 export type { BackendCfg, DeployHealthCheckOptions, DeployInfo }
 

package/src/index.ts

@@ -1,35 +1,35 @@
-import onFinished = require('on-finished')
-export * from './admin/adminMiddleware'
-export * from './admin/base.admin.service'
-export * from './admin/firebase.shared.service'
-export * from './admin/secureHeaderMiddleware'
-export * from './env/env.shared.service'
-export * from './sentry/sentry.shared.service'
-export * from './server/asyncLocalStorageMiddleware'
-export * from './server/basicAuthMiddleware'
-export * from './server/bodyParserTimeoutMiddleware'
-export * from './server/createDefaultApp'
-export * from './server/createDefaultApp.model'
-export * from './server/deployInfo.util'
-export * from './server/genericErrorMiddleware'
-export * from './server/getDefaultRouter'
-export * from './server/logMiddleware'
-export * from './server/methodOverrideMiddleware'
-export * from './server/notFoundMiddleware'
-export * from './server/okMiddleware'
-export * from './server/request.log.util'
-export * from './server/request.util'
-export * from './server/requestTimeoutMiddleware'
-export * from './server/safeJsonMiddleware'
-export * from './server/server.model'
-export * from './server/serverStatsMiddleware'
-export * from './server/serverStatusMiddleware'
-export * from './server/simpleRequestLoggerMiddleware'
-export * from './server/startServer'
-export * from './server/startServer.model'
-export * from './server/validation/validateMiddleware'
-export * from './server/validation/validateRequest'
-export * from './server/validation/zodValidateMiddleware'
-export * from './util'
+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'
+export * from './server/okMiddleware.js'
+export * from './server/request.log.util.js'
+export * from './server/request.util.js'
+export * from './server/requestTimeoutMiddleware.js'
+export * from './server/safeJsonMiddleware.js'
+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/validateMiddleware.js'
+export * from './server/validation/validateRequest.js'
+export * from './server/validation/zodValidateMiddleware.js'
+export * from './util.js'
 
 export { onFinished }

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

@@ -4,7 +4,7 @@ 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'
+import { getRequestLogger } from '../index.js'
 
 export interface SentrySharedServiceCfg {
   sentry: typeof SentryLib

package/src/server/asyncLocalStorageMiddleware.ts

@@ -1,8 +1,8 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 import type { CommonLogger } from '@naturalcycles/js-lib'
 import { _lazyValue } from '@naturalcycles/js-lib'
-import { ciLogger, devLogger, gaeLogger } from './logMiddleware'
-import type { BackendRequest, BackendRequestHandler } from './server.model'
+import { ciLogger, devLogger, gaeLogger } from './logMiddleware.js'
+import type { BackendRequest, BackendRequestHandler } from './server.model.js'
 
 const { GAE_INSTANCE, CI } = process.env
 const isGAE = !!GAE_INSTANCE

package/src/server/basicAuthMiddleware.ts

@@ -1,7 +1,7 @@
 import type { StringMap } from '@naturalcycles/js-lib'
 import { _split } from '@naturalcycles/js-lib'
 import { base64ToString, timingSafeStringEqual } from '@naturalcycles/nodejs-lib'
-import type { BackendRequestHandler } from './server.model'
+import type { BackendRequestHandler } from './server.model.js'
 
 export interface BasicAuthMiddlewareCfg {
   /**

package/src/server/bodyParserTimeoutMiddleware.ts

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

package/src/server/createDefaultApp.model.ts

@@ -1,8 +1,8 @@
 import type { Options, OptionsJson, OptionsUrlencoded } from 'body-parser'
 import type { CorsOptions } from 'cors'
-import type { SentrySharedService } from '../sentry/sentry.shared.service'
-import type { GenericErrorMiddlewareCfg } from './genericErrorMiddleware'
-import type { BackendRequestHandler } from './server.model'
+import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
+import type { GenericErrorMiddlewareCfg } from './genericErrorMiddleware.js'
+import type { BackendRequestHandler } from './server.model.js'
 
 /**
  * Plain RequestHandler can be provided - then it's mounted to /

package/src/server/createDefaultApp.ts

@@ -1,23 +1,24 @@
-import cookieParser = require('cookie-parser')
-import cors = require('cors')
-import express = require('express')
-import type { BackendApplication } from '..'
-import { isGAE, methodOverrideMiddleware } from '..'
-import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware'
+import cookieParser from 'cookie-parser'
+import cors from 'cors'
+import express from 'express'
+import { isGAE } from '../util.js'
+import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware.js'
 import type {
   BackendRequestHandlerCfg,
   BackendRequestHandlerWithPath,
   DefaultAppCfg,
-} from './createDefaultApp.model'
-import { genericErrorMiddleware } from './genericErrorMiddleware'
-import { logMiddleware } from './logMiddleware'
-import { notFoundMiddleware } from './notFoundMiddleware'
-import { requestTimeoutMiddleware } from './requestTimeoutMiddleware'
-import { simpleRequestLoggerMiddleware } from './simpleRequestLoggerMiddleware'
+} 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'
 
 const isTest = process.env['APP_ENV'] === 'test'
 
-export function createDefaultApp(cfg: DefaultAppCfg): BackendApplication {
+export async function createDefaultApp(cfg: DefaultAppCfg): Promise<BackendApplication> {
   const { sentryService } = cfg
 
   const app = express()
@@ -75,8 +76,9 @@ export function createDefaultApp(cfg: DefaultAppCfg): BackendApplication {
 
   if (!isTest) {
     // leaks, load lazily
+    const { default: helmet } = await import('helmet')
     app.use(
-      require('helmet')({
+      helmet({
         contentSecurityPolicy: false, // to allow "admin 401 auto-redirect"
       }),
     )

package/src/server/deployInfo.util.ts

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

package/src/server/genericErrorMiddleware.ts

@@ -1,7 +1,7 @@
 import type { AppError, BackendErrorResponseObject, ErrorObject } from '@naturalcycles/js-lib'
 import { _anyToError, _errorLikeToErrorObject, _filterUndefinedValues } from '@naturalcycles/js-lib'
-import type { SentrySharedService } from '../sentry/sentry.shared.service'
-import type { BackendErrorRequestHandler, BackendRequest, BackendResponse } from './server.model'
+import type { SentrySharedService } from '../sentry/sentry.shared.service.js'
+import type { BackendErrorRequestHandler, BackendRequest, BackendResponse } from './server.model.js'
 
 export interface GenericErrorMiddlewareCfg {
   sentryService?: SentrySharedService

package/src/server/getDefaultRouter.ts

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

package/src/server/logMiddleware.ts

@@ -1,7 +1,7 @@
 import { inspect } from 'node:util'
 import type { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
 import { _inspect, dimGrey } from '@naturalcycles/nodejs-lib'
-import type { BackendRequestHandler } from './server.model'
+import type { BackendRequestHandler } from './server.model.js'
 
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE, APP_ENV } = process.env
 const isGAE = !!GAE_INSTANCE

package/src/server/methodOverrideMiddleware.ts

@@ -1,4 +1,4 @@
-import type { BackendRequestHandler } from './server.model'
+import type { BackendRequestHandler } from './server.model.js'
 
 export interface MethodOverrideMiddlewareCfg {
   /**

package/src/server/notFoundMiddleware.ts

@@ -1,5 +1,5 @@
-import { getRequestEndpoint } from './request.util'
-import type { BackendRequestHandler } from './server.model'
+import { getRequestEndpoint } from './request.util.js'
+import type { BackendRequestHandler } from './server.model.js'
 
 export function notFoundMiddleware(): BackendRequestHandler {
   return (req, res) => {