fix: deps

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: build
-        run: yarn build-prod
+        run: yarn build
 
       - name: release
         env:

.husky/commit-msg

@@ -1,6 +1,3 @@
-#!/bin/sh
 [ -n "$CI" ] && exit 0
-. "$(dirname "$0")/_/husky.sh"
 
-./node_modules/.bin/commitlint-def $1
-# exit 1 # uncomment to debug
+dev-lib commitlint $1

.husky/pre-commit

@@ -1,5 +1,3 @@
-#!/bin/sh
 [ -n "$CI" ] && exit 0
-. "$(dirname "$0")/_/husky.sh"
 
-./node_modules/.bin/lint-staged-def
+dev-lib lint-staged

eslint.config.js

@@ -0,0 +1,4 @@
+// prettier-ignore
+module.exports = [
+  ...require('@naturalcycles/dev-lib/cfg/eslint.config'),
+]

package.json

@@ -3,6 +3,11 @@
   "version": "2.61.0",
   "scripts": {
     "prepare": "husky",
+    "build": "dev-lib build",
+    "test": "dev-lib test",
+    "lint": "dev-lib lint",
+    "bt": "dev-lib bt",
+    "lbt": "dev-lib lbt",
     "dev": "APP_ENV=dev node -r ts-node/register --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",
@@ -37,7 +42,7 @@
   },
   "devDependencies": {
     "@naturalcycles/bench-lib": "^3.0.0",
-    "@naturalcycles/dev-lib": "^13.0.0",
+    "@naturalcycles/dev-lib": "^15.0.4",
     "@sentry/node": "^7.0.0",
     "@types/ejs": "^3.0.0",
     "@types/node": "^20.1.0",
@@ -71,7 +76,7 @@
     "url": "https://github.com/NaturalCycles/backend-lib"
   },
   "engines": {
-    "node": ">=18.12.0"
+    "node": ">=20.12.0"
   },
   "type": "commonjs",
   "description": "Standard library for making Express.js / AppEngine based backend services",

scripts/validation.bench.script.ts

@@ -7,7 +7,7 @@ yarn tsn validation.bench
 import http from 'node:http'
 import { runCannon } from '@naturalcycles/bench-lib'
 import { jsonSchema } from '@naturalcycles/js-lib'
-import { objectSchema, stringSchema, runScript } from '@naturalcycles/nodejs-lib'
+import { objectSchema, runScript, stringSchema } from '@naturalcycles/nodejs-lib'
 import express = require('express')
 import { BackendApplication, validateBody, validateRequest } from '../src'
 

src/admin/secureHeaderMiddleware.ts

@@ -42,8 +42,9 @@ function requireSecureHeaderOrAdmin(
 
     // Header provided - don't check for Admin
     if (providedHeader) {
-      if (!secureHeaderValue || timingSafeStringEqual(providedHeader, secureHeaderValue))
+      if (!secureHeaderValue || timingSafeStringEqual(providedHeader, secureHeaderValue)) {
         return next()
+      }
 
       return next(
         new AppError('secureHeader or adminToken is required', {

src/deploy/deployGae.ts

@@ -1,4 +1,3 @@
-import { buildProdCommand } from '@naturalcycles/dev-lib'
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
 import { appendToGithubSummary, execVoidCommandSync } from '@naturalcycles/nodejs-lib'
 import { getBackendCfg } from './backend.cfg.util'
@@ -11,9 +10,9 @@ export interface DeployGaeOptions extends DeployPrepareOptions, DeployHealthChec
 export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
   const { logOnFailure, logOnSuccess } = opt
 
-  // 1. build-prod
+  // 1. build
 
-  buildProdCommand()
+  execVoidCommandSync('yarn', ['build'])
 
   // 2. deploy-prepare
 

src/deploy/deployHealthCheck.ts

@@ -1,6 +1,6 @@
 import { inspect, InspectOptions } from 'node:util'
-import { pDelay, _filterFalsyValues, _ms, _since, getFetcher } from '@naturalcycles/js-lib'
-import { execVoidCommandSync, dimGrey, red } from '@naturalcycles/nodejs-lib'
+import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib'
+import { dimGrey, execVoidCommandSync, red } from '@naturalcycles/nodejs-lib'
 import { coloredHttpCode } from '../server/request.log.util'
 
 export interface DeployHealthCheckOptions {

src/deploy/index.ts

@@ -5,13 +5,13 @@ import { deployGae } from './deployGae'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
 import { deployPrepare } from './deployPrepare'
 
-export type { BackendCfg, DeployInfo, DeployHealthCheckOptions }
+export type { BackendCfg, DeployHealthCheckOptions, DeployInfo }
 
 export {
-  getBackendCfg,
-  createDeployInfo,
   createAppYaml,
+  createDeployInfo,
   deployGae,
-  deployPrepare,
   deployHealthCheck,
+  deployPrepare,
+  getBackendCfg,
 }

src/general.server.test.ts

@@ -7,9 +7,9 @@ import {
   pExpectedError,
 } from '@naturalcycles/js-lib'
 import { arraySchema, deflateString, objectSchema } from '@naturalcycles/nodejs-lib'
+import { getDefaultRouter, validateRequest } from './index'
 import { safeJsonMiddleware } from './server/safeJsonMiddleware'
 import { expressTestService } from './testing'
-import { getDefaultRouter, validateRequest } from './index'
 
 const router = getDefaultRouter()
 router.get('/circular', safeJsonMiddleware(), async req => {

src/index.ts

@@ -7,31 +7,31 @@ export * from './env/env.model'
 export * from './env/env.shared.service'
 export * from './gae/appEngine.util'
 export * from './sentry/sentry.shared.service'
+export * from './server/appEngineLogMiddleware'
+export * from './server/asyncLocalStorageMiddleware'
+export * from './server/basicAuthMiddleware'
+export * from './server/bodyParserTimeoutMiddleware'
 export * from './server/catchWrapper'
 export * from './server/createDefaultApp'
 export * from './server/createDefaultApp.model'
 export * from './server/deployInfo.util'
-export * from './server/getDefaultRouter'
-export * from './server/bodyParserTimeoutMiddleware'
 export * from './server/genericErrorMiddleware'
-export * from './server/serverStatsMiddleware'
+export * from './server/getDefaultRouter'
 export * from './server/methodOverrideMiddleware'
 export * from './server/notFoundMiddleware'
 export * from './server/okMiddleware'
-export * from './server/basicAuthMiddleware'
+export * from './server/request.log.util'
+export * from './server/request.util'
 export * from './server/requestTimeoutMiddleware'
-export * from './server/validation/validateRequest'
-export * from './server/simpleRequestLoggerMiddleware'
+export * from './server/safeJsonMiddleware'
+export * from './server/server.model'
+export * from './server/serverStatsMiddleware'
 export * from './server/serverStatusMiddleware'
-export * from './server/validation/validateMiddleware'
-export * from './server/validation/zodValidateMiddleware'
-export * from './server/request.log.util'
+export * from './server/simpleRequestLoggerMiddleware'
 export * from './server/startServer'
 export * from './server/startServer.model'
-export * from './server/asyncLocalStorageMiddleware'
-export * from './server/server.model'
-export * from './server/appEngineLogMiddleware'
-export * from './server/safeJsonMiddleware'
-export * from './server/request.util'
+export * from './server/validation/validateMiddleware'
+export * from './server/validation/validateRequest'
+export * from './server/validation/zodValidateMiddleware'
 
 export { onFinished }

src/sentry/sentry.shared.service.ts

@@ -126,8 +126,9 @@ export class SentrySharedService {
     if (
       data?.reportRate && // E.g rate of 0.1 means 10% of errors are reported
       Math.random() > data.reportRate
-    )
+    ) {
       return
+    }
 
     // This is to avoid Sentry cutting err.message to 253 characters
     // It will log additional "breadcrumb object" before the error

src/server/appEngineLogMiddleware.ts

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

src/server/asyncLocalStorageMiddleware.ts

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

src/server/createDefaultApp.ts

@@ -5,9 +5,9 @@ import { BackendApplication, isGAE, methodOverrideMiddleware } from '..'
 import { appEngineLogMiddleware } from './appEngineLogMiddleware'
 import { asyncLocalStorageMiddleware } from './asyncLocalStorageMiddleware'
 import {
-  DefaultAppCfg,
   BackendRequestHandlerCfg,
   BackendRequestHandlerWithPath,
+  DefaultAppCfg,
 } from './createDefaultApp.model'
 import { genericErrorMiddleware } from './genericErrorMiddleware'
 import { notFoundMiddleware } from './notFoundMiddleware'

src/server/server.model.ts

@@ -1,5 +1,5 @@
 import type { CommonLogFunction, Promisable } from '@naturalcycles/js-lib'
-import type { IRouter, Request, NextFunction, Response, Application } from 'express'
+import type { Application, IRouter, NextFunction, Request, Response } from 'express'
 
 /**
  * Use this interface instead of express.Request in cases when TypeScript gives an error, because it haven't "included" this very file.

src/server/validation/validateMiddleware.ts

@@ -1,4 +1,4 @@
-import { JsonSchema, JsonSchemaBuilder, _get, AppError } from '@naturalcycles/js-lib'
+import { _get, AppError, JsonSchema, JsonSchemaBuilder } from '@naturalcycles/js-lib'
 import { AjvSchema, AjvValidationError } from '@naturalcycles/nodejs-lib'
 import { BackendRequestHandler } from '../server.model'
 import { ReqValidationOptions } from './validateRequest'

src/test/env/test1.env.ts

@@ -3,5 +3,4 @@ const test1Env = {
   a: 'a1',
 }
 
-// eslint-disable-next-line import/no-default-export
 export default test1Env

src/test/env/test2.env.ts

@@ -3,5 +3,4 @@ const test2Env = {
   a: 'a2',
 }
 
-// eslint-disable-next-line import/no-default-export
 export default test2Env

src/test/globalSetup.ts

@@ -18,7 +18,7 @@ declare global {
   }
 }
 
-// eslint-disable-next-line import/no-anonymous-default-export, import/no-default-export, unicorn/no-anonymous-default-export
+// eslint-disable-next-line import/no-anonymous-default-export, unicorn/no-anonymous-default-export
 export default async (): Promise<void> => {
   const resources = [debugResource]
 

src/test/globalTeardown.ts

@@ -1,6 +1,6 @@
 import { _since } from '@naturalcycles/js-lib'
 
-// eslint-disable-next-line import/no-anonymous-default-export, import/no-default-export, unicorn/no-anonymous-default-export
+// eslint-disable-next-line import/no-anonymous-default-export, unicorn/no-anonymous-default-export
 export default async (): Promise<void> => {
   const started = Date.now()
   // @ts-expect-error

src/test/server/server.ts

@@ -15,12 +15,12 @@ console.log('startServer... ')
 import { _errorLikeToErrorObject, AppError, pDelay } from '@naturalcycles/js-lib'
 import { loginHtml } from '../../admin/adminMiddleware'
 import {
-  startServer,
+  basicAuthMiddleware,
   getDefaultRouter,
-  serverStatusMiddleware,
   okMiddleware,
   SentrySharedService,
-  basicAuthMiddleware,
+  serverStatusMiddleware,
+  startServer,
 } from '../../index'
 import {
   getRequest,