@naturalcycles/backend-lib 3.0.0 → 3.4.0

package/dist/deploy/deploy.util.js

@@ -7,7 +7,7 @@ const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const time_lib_1 = require("@naturalcycles/time-lib");
 const yaml = require("js-yaml");
 const APP_YAML_DEFAULT = () => ({
-    runtime: 'nodejs14',
+    runtime: 'nodejs16',
     service: 'default',
     inbound_services: ['warmup'],
     instance_class: 'F1',

package/dist/deploy/deployPrepare.js

@@ -47,6 +47,7 @@ const DEFAULT_FILES = [
     'tsconfig.dist.json',
     '.gcloudignore',
     'app.yaml',
+    'patches', // to allow patch-package
 ];
 const defaultFilesDir = `${paths_cnst_1.srcDir}/deploy/files-default`;
 async function deployPrepare(opt = {}) {

package/dist/server/deployInfo.util.d.ts

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

package/dist/server/genericErrorMiddleware.js

@@ -36,7 +36,12 @@ exports.genericErrorMiddleware = genericErrorMiddleware;
 function respondWithError(req, res, err) {
     var _a, _b;
     const { headersSent } = res;
-    req.error(`genericErrorHandler${headersSent ? ' after headersSent' : ''}:\n`, err);
+    if (headersSent) {
+        req.error(`after headersSent`, err);
+    }
+    else {
+        req.error(err);
+    }
     const originalError = (0, js_lib_1._anyToError)(err, Error, {
         stringifyFn: nodejs_lib_1.inspectAnyStringifyFn,
     });

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

@@ -1,13 +1,13 @@
-import { Got } from '@naturalcycles/nodejs-lib';
+import { GetGotOptions, Got } from '@naturalcycles/nodejs-lib';
 import { BackendApplication } from '../index';
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model';
 export interface ExpressApp extends Got {
     close(): Promise<void>;
 }
 declare class ExpressTestService {
-    createAppFromResource(resource: BackendRequestHandlerCfg): ExpressApp;
-    createAppFromResources(resources: BackendRequestHandlerCfg[]): ExpressApp;
-    createApp(app: BackendApplication): ExpressApp;
+    createAppFromResource(resource: BackendRequestHandlerCfg, opt?: GetGotOptions): ExpressApp;
+    createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: GetGotOptions): ExpressApp;
+    createApp(app: BackendApplication, opt?: GetGotOptions): ExpressApp;
     /**
      * Creates a "Default Express App" with provided resources.
      * Starts an http server on '127.0.0.1' and random available port.

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

@@ -9,17 +9,17 @@ const index_1 = require("../index");
 //   await app.close()
 // })
 class ExpressTestService {
-    createAppFromResource(resource) {
+    createAppFromResource(resource, opt) {
         return this.createApp((0, index_1.createDefaultApp)({
             resources: [resource],
-        }));
+        }), opt);
     }
-    createAppFromResources(resources) {
+    createAppFromResources(resources, opt) {
         return this.createApp((0, index_1.createDefaultApp)({
             resources,
-        }));
+        }), opt);
     }
-    createApp(app) {
+    createApp(app, opt) {
         const server = this.createTestServer(app);
         const { port } = server.address();
         const prefixUrl = `http://127.0.0.1:${port}`;
@@ -27,6 +27,9 @@ class ExpressTestService {
             prefixUrl,
             responseType: 'json',
             retry: 0,
+            logStart: true,
+            logFinished: true,
+            ...opt,
         });
         got.close = async () => {
             await new Promise(resolve => server.close(resolve));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "3.0.0",
+  "version": "3.4.0",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",
@@ -45,7 +45,6 @@
     "@types/ejs": "^3.0.0",
     "@types/js-yaml": "^4.0.0",
     "@types/node": "^16.4.1",
-    "esbuild": "^0.13.13",
     "esbuild-register": "^3.1.2",
     "fastify": "^3.20.1",
     "jest": "^27.0.1",

package/src/deploy/deploy.util.ts

@@ -8,7 +8,7 @@ import { BackendCfg } from './backend.cfg.util'
 import { AppYaml, DeployInfo } from './deploy.model'
 
 const APP_YAML_DEFAULT = (): AppYaml => ({
-  runtime: 'nodejs14',
+  runtime: 'nodejs16',
   service: 'default',
   inbound_services: ['warmup'],
   instance_class: 'F1',

package/src/deploy/deployPrepare.ts

@@ -59,6 +59,7 @@ const DEFAULT_FILES = [
   'tsconfig.dist.json',
   '.gcloudignore',
   'app.yaml',
+  'patches', // to allow patch-package
 ]
 
 const defaultFilesDir = `${srcDir}/deploy/files-default`

package/src/server/genericErrorMiddleware.ts

@@ -53,7 +53,11 @@ export function genericErrorMiddleware(
 export function respondWithError(req: BackendRequest, res: BackendResponse, err: any): void {
   const { headersSent } = res
 
-  req.error(`genericErrorHandler${headersSent ? ' after headersSent' : ''}:\n`, err)
+  if (headersSent) {
+    req.error(`after headersSent`, err)
+  } else {
+    req.error(err)
+  }
 
   const originalError = _anyToError(err, Error, {
     stringifyFn: inspectAnyStringifyFn,

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

@@ -1,6 +1,6 @@
 import { Server } from 'http'
 import { AddressInfo } from 'net'
-import { getGot, Got } from '@naturalcycles/nodejs-lib'
+import { getGot, GetGotOptions, Got } from '@naturalcycles/nodejs-lib'
 import { BackendApplication, createDefaultApp } from '../index'
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model'
 
@@ -15,23 +15,25 @@ export interface ExpressApp extends Got {
 // })
 
 class ExpressTestService {
-  createAppFromResource(resource: BackendRequestHandlerCfg): ExpressApp {
+  createAppFromResource(resource: BackendRequestHandlerCfg, opt?: GetGotOptions): ExpressApp {
     return this.createApp(
       createDefaultApp({
         resources: [resource],
       }),
+      opt,
     )
   }
 
-  createAppFromResources(resources: BackendRequestHandlerCfg[]): ExpressApp {
+  createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: GetGotOptions): ExpressApp {
     return this.createApp(
       createDefaultApp({
         resources,
       }),
+      opt,
     )
   }
 
-  createApp(app: BackendApplication): ExpressApp {
+  createApp(app: BackendApplication, opt?: GetGotOptions): ExpressApp {
     const server = this.createTestServer(app)
     const { port } = server.address() as AddressInfo
     const prefixUrl = `http://127.0.0.1:${port}`
@@ -40,6 +42,9 @@ class ExpressTestService {
       prefixUrl,
       responseType: 'json',
       retry: 0,
+      logStart: true,
+      logFinished: true,
+      ...opt,
     }) as ExpressApp
 
     got.close = async () => {