@naturalcycles/backend-lib 4.18.7 → 4.18.8

package/dist/db/httpDB.d.ts

@@ -1,8 +1,8 @@
-import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
+import { FetcherOptions, JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib';
 import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, RunQueryResult } from '@naturalcycles/db-lib';
-import { GetGotOptions, ReadableTyped } from '@naturalcycles/nodejs-lib';
-export interface HttpDBCfg extends GetGotOptions {
-    prefixUrl: string;
+import { ReadableTyped } from '@naturalcycles/nodejs-lib';
+export interface HttpDBCfg extends FetcherOptions {
+    baseUrl: string;
 }
 /**
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
@@ -11,7 +11,7 @@ export declare class HttpDB extends BaseCommonDB implements CommonDB {
     cfg: HttpDBCfg;
     constructor(cfg: HttpDBCfg);
     setCfg(cfg: HttpDBCfg): void;
-    private got;
+    private fetcher;
     ping(): Promise<void>;
     getTables(): Promise<string[]>;
     getTableSchema<ROW extends ObjectWithId>(table: string): Promise<JsonSchemaRootObject<ROW>>;

package/dist/db/httpDB.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpDB = void 0;
 const node_stream_1 = require("node:stream");
+const js_lib_1 = require("@naturalcycles/js-lib");
 const db_lib_1 = require("@naturalcycles/db-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 /**
  * Implementation of CommonDB that proxies all requests via HTTP to "httpDBRequestHandler".
  */
@@ -14,53 +14,47 @@ class HttpDB extends db_lib_1.BaseCommonDB {
         this.setCfg(cfg);
     }
     setCfg(cfg) {
-        this.got = (0, nodejs_lib_1.getGot)(cfg);
+        this.fetcher = (0, js_lib_1.getFetcher)(cfg);
     }
     async ping() {
-        await this.got(`ping`);
+        await this.fetcher.getVoid(`ping`);
     }
     async getTables() {
-        return await this.got(`tables`).json();
+        return await this.fetcher.get(`tables`);
     }
     async getTableSchema(table) {
-        return await this.got(`${table}/schema`).json();
+        return await this.fetcher.get(`${table}/schema`);
     }
     async resetCache(table = '') {
-        await this.got.put(`resetCache/${table}`);
+        await this.fetcher.putVoid(`resetCache/${table}`);
     }
     async getByIds(table, ids, opt) {
-        return await this.got
-            .put(`getByIds`, {
+        return await this.fetcher.put(`getByIds`, {
             json: {
                 table,
                 ids,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async runQuery(query, opt) {
-        return await this.got
-            .put(`runQuery`, {
+        return await this.fetcher.put(`runQuery`, {
             json: {
                 query,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async runQueryCount(query, opt) {
-        return await this.got
-            .put(`runQueryCount`, {
+        return await this.fetcher.put(`runQueryCount`, {
             json: {
                 query,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async saveBatch(table, rows, opt) {
-        await this.got.put(`saveBatch`, {
+        await this.fetcher.putVoid(`saveBatch`, {
             json: {
                 table,
                 rows,
@@ -69,25 +63,21 @@ class HttpDB extends db_lib_1.BaseCommonDB {
         });
     }
     async deleteByIds(table, ids, opt) {
-        return await this.got
-            .put(`deleteByIds`, {
+        return await this.fetcher.put(`deleteByIds`, {
             json: {
                 table,
                 ids,
                 opt,
             },
-        })
-            .json();
+        });
     }
     async deleteByQuery(query, opt) {
-        return await this.got
-            .put(`deleteByQuery`, {
+        return await this.fetcher.put(`deleteByQuery`, {
             json: {
                 query,
                 opt,
             },
-        })
-            .json();
+        });
     }
     streamQuery(_q, _opt) {
         console.warn(`streamQuery not implemented`);

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

@@ -1,13 +1,13 @@
-import { GetGotOptions, Got } from '@naturalcycles/nodejs-lib';
+import { Fetcher, FetcherOptions } from '@naturalcycles/js-lib';
 import { BackendApplication, DefaultAppCfg } from '../index';
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model';
-export interface ExpressApp extends Got {
+export interface ExpressApp extends Fetcher {
     close: () => Promise<void>;
 }
 declare class ExpressTestService {
-    createAppFromResource(resource: BackendRequestHandlerCfg, opt?: GetGotOptions, defaultAppCfg?: DefaultAppCfg): ExpressApp;
-    createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: GetGotOptions): ExpressApp;
-    createApp(app: BackendApplication, opt?: GetGotOptions): ExpressApp;
+    createAppFromResource(resource: BackendRequestHandlerCfg, opt?: FetcherOptions, defaultAppCfg?: DefaultAppCfg): ExpressApp;
+    createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: FetcherOptions): ExpressApp;
+    createApp(app: BackendApplication, opt?: FetcherOptions): 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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expressTestService = void 0;
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
+const js_lib_1 = require("@naturalcycles/js-lib");
 const index_1 = require("../index");
+const nativeFetchFn = async (url, init) => await globalThis.fetch(url, init);
 // Example:
 // const app = expressTestService.createApp([ debugResource ])
 // afterAll(async () => {
@@ -23,21 +24,31 @@ class ExpressTestService {
     createApp(app, opt) {
         const server = this.createTestServer(app);
         const { port } = server.address();
-        const prefixUrl = `http://127.0.0.1:${port}`;
-        const got = (0, nodejs_lib_1.getGot)({
-            prefixUrl,
+        const baseUrl = `http://127.0.0.1:${port}`;
+        const fetcher = (0, js_lib_1.getFetcher)({
+            baseUrl,
             responseType: 'json',
-            retry: 0,
-            logStart: true,
-            logFinished: true,
+            retry: { count: 0 },
+            logRequest: true,
+            logResponse: true,
+            logWithBaseUrl: false,
+            fetchFn: nativeFetchFn,
             ...opt,
+        }).onAfterResponse(async () => {
+            // This "empty" hook exists to act like `await pDelay`,
+            // 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)();
         });
-        got.close = async () => {
+        fetcher.close = async () => {
+            const started = Date.now();
             await new Promise(resolve => server.close(resolve));
+            console.log(`close took ${(0, js_lib_1._since)(started)}`); // todo: investigate why it takes ~5 seconds!
             // server.destroy()
             // await pDelay(1000)
         };
-        return got;
+        return fetcher;
     }
     /**
      * Creates a "Default Express App" with provided resources.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.18.7",
+  "version": "4.18.8",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@naturalcycles/db-lib": "^8.0.2",
     "@naturalcycles/js-lib": "^14.27.0",
-    "@naturalcycles/nodejs-lib": "^12.0.0",
+    "@naturalcycles/nodejs-lib": "^13.1.0",
     "@types/cookie-parser": "^1.4.1",
     "@types/cors": "^2.8.4",
     "@types/express": "^4.16.1",

package/src/db/httpDB.ts

@@ -1,5 +1,11 @@
 import { Readable } from 'node:stream'
-import { JsonSchemaRootObject, ObjectWithId } from '@naturalcycles/js-lib'
+import {
+  Fetcher,
+  FetcherOptions,
+  getFetcher,
+  JsonSchemaRootObject,
+  ObjectWithId,
+} from '@naturalcycles/js-lib'
 import {
   BaseCommonDB,
   CommonDB,
@@ -9,10 +15,10 @@ import {
   DBQuery,
   RunQueryResult,
 } from '@naturalcycles/db-lib'
-import { getGot, GetGotOptions, Got, ReadableTyped } from '@naturalcycles/nodejs-lib'
+import { ReadableTyped } from '@naturalcycles/nodejs-lib'
 
-export interface HttpDBCfg extends GetGotOptions {
-  prefixUrl: string
+export interface HttpDBCfg extends FetcherOptions {
+  baseUrl: string
 }
 
 /**
@@ -25,27 +31,27 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
   }
 
   setCfg(cfg: HttpDBCfg): void {
-    this.got = getGot(cfg)
+    this.fetcher = getFetcher(cfg)
   }
 
-  private got!: Got
+  private fetcher!: Fetcher
 
   override async ping(): Promise<void> {
-    await this.got(`ping`)
+    await this.fetcher.getVoid(`ping`)
   }
 
   override async getTables(): Promise<string[]> {
-    return await this.got(`tables`).json()
+    return await this.fetcher.get(`tables`)
   }
 
   override async getTableSchema<ROW extends ObjectWithId>(
     table: string,
   ): Promise<JsonSchemaRootObject<ROW>> {
-    return await this.got(`${table}/schema`).json()
+    return await this.fetcher.get(`${table}/schema`)
   }
 
   async resetCache(table = ''): Promise<void> {
-    await this.got.put(`resetCache/${table}`)
+    await this.fetcher.putVoid(`resetCache/${table}`)
   }
 
   override async getByIds<ROW extends ObjectWithId>(
@@ -53,43 +59,37 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
     ids: ROW['id'][],
     opt?: CommonDBOptions,
   ): Promise<ROW[]> {
-    return await this.got
-      .put(`getByIds`, {
-        json: {
-          table,
-          ids,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`getByIds`, {
+      json: {
+        table,
+        ids,
+        opt,
+      },
+    })
   }
 
   override async runQuery<ROW extends ObjectWithId>(
     query: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<RunQueryResult<ROW>> {
-    return await this.got
-      .put(`runQuery`, {
-        json: {
-          query,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`runQuery`, {
+      json: {
+        query,
+        opt,
+      },
+    })
   }
 
   override async runQueryCount<ROW extends ObjectWithId>(
     query: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<number> {
-    return await this.got
-      .put(`runQueryCount`, {
-        json: {
-          query,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`runQueryCount`, {
+      json: {
+        query,
+        opt,
+      },
+    })
   }
 
   override async saveBatch<ROW extends Partial<ObjectWithId>>(
@@ -97,7 +97,7 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
     rows: ROW[],
     opt?: CommonDBSaveOptions<ROW>,
   ): Promise<void> {
-    await this.got.put(`saveBatch`, {
+    await this.fetcher.putVoid(`saveBatch`, {
       json: {
         table,
         rows,
@@ -107,29 +107,25 @@ export class HttpDB extends BaseCommonDB implements CommonDB {
   }
 
   async deleteByIds(table: string, ids: string[], opt?: CommonDBOptions): Promise<number> {
-    return await this.got
-      .put(`deleteByIds`, {
-        json: {
-          table,
-          ids,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`deleteByIds`, {
+      json: {
+        table,
+        ids,
+        opt,
+      },
+    })
   }
 
   override async deleteByQuery<ROW extends ObjectWithId>(
     query: DBQuery<ROW>,
     opt?: CommonDBOptions,
   ): Promise<number> {
-    return await this.got
-      .put(`deleteByQuery`, {
-        json: {
-          query,
-          opt,
-        },
-      })
-      .json()
+    return await this.fetcher.put(`deleteByQuery`, {
+      json: {
+        query,
+        opt,
+      },
+    })
   }
 
   override streamQuery<ROW extends ObjectWithId>(

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

@@ -1,10 +1,19 @@
 import { Server } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { getGot, GetGotOptions, Got } from '@naturalcycles/nodejs-lib'
+import {
+  _since,
+  Fetcher,
+  FetcherOptions,
+  FetchFunction,
+  getFetcher,
+  pDelay,
+} from '@naturalcycles/js-lib'
 import { BackendApplication, createDefaultApp, DefaultAppCfg } from '../index'
 import { BackendRequestHandlerCfg } from '../server/createDefaultApp.model'
 
-export interface ExpressApp extends Got {
+const nativeFetchFn: FetchFunction = async (url, init) => await globalThis.fetch(url, init)
+
+export interface ExpressApp extends Fetcher {
   close: () => Promise<void>
 }
 
@@ -17,7 +26,7 @@ export interface ExpressApp extends Got {
 class ExpressTestService {
   createAppFromResource(
     resource: BackendRequestHandlerCfg,
-    opt?: GetGotOptions,
+    opt?: FetcherOptions,
     defaultAppCfg?: DefaultAppCfg,
   ): ExpressApp {
     return this.createApp(
@@ -29,7 +38,7 @@ class ExpressTestService {
     )
   }
 
-  createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: GetGotOptions): ExpressApp {
+  createAppFromResources(resources: BackendRequestHandlerCfg[], opt?: FetcherOptions): ExpressApp {
     return this.createApp(
       createDefaultApp({
         resources,
@@ -38,27 +47,37 @@ class ExpressTestService {
     )
   }
 
-  createApp(app: BackendApplication, opt?: GetGotOptions): ExpressApp {
+  createApp(app: BackendApplication, opt?: FetcherOptions): ExpressApp {
     const server = this.createTestServer(app)
     const { port } = server.address() as AddressInfo
-    const prefixUrl = `http://127.0.0.1:${port}`
+    const baseUrl = `http://127.0.0.1:${port}`
 
-    const got = getGot({
-      prefixUrl,
+    const fetcher = getFetcher({
+      baseUrl,
       responseType: 'json',
-      retry: 0,
-      logStart: true,
-      logFinished: true,
+      retry: { count: 0 },
+      logRequest: true,
+      logResponse: true,
+      logWithBaseUrl: false, // for stable error snapshots
+      fetchFn: nativeFetchFn, // this is to make it NOT mockable
       ...opt,
+    }).onAfterResponse(async () => {
+      // This "empty" hook exists to act like `await pDelay`,
+      // so tests using it can reply on `void someAnalyticsService.doSmth()` promises
+      // to be done by that time.
+      // Smart, huh?
+      await pDelay()
     }) as ExpressApp
 
-    got.close = async () => {
+    fetcher.close = async () => {
+      const started = Date.now()
       await new Promise(resolve => server.close(resolve))
+      console.log(`close took ${_since(started)}`) // todo: investigate why it takes ~5 seconds!
       // server.destroy()
       // await pDelay(1000)
     }
 
-    return got
+    return fetcher
   }
 
   /**