@naturalcycles/backend-lib 4.10.2 → 4.12.0

package/dist/deploy/deployHealthCheck.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployHealthCheck = exports.deployHealthCheckYargsOptions = void 0;
 const node_util_1 = require("node:util");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const exec_1 = require("@naturalcycles/nodejs-lib/dist/exec");
 const request_log_util_1 = require("../server/request.log.util");
@@ -66,7 +65,7 @@ async function deployHealthCheck(url, opt = {}) {
     let doneReason;
     let failed = false;
     let currentInterval = intervalSec * 1000;
-    const got = (0, nodejs_lib_1.getGot)();
+    const fetcher = (0, js_lib_1.getFetcher)();
     while (!done) {
         // eslint-disable-next-line no-await-in-loop
         await makeAttempt();
@@ -85,18 +84,18 @@ async function deployHealthCheck(url, opt = {}) {
         attempt++;
         console.log([`>>`, (0, colors_1.dimGrey)(url), (0, node_util_1.inspect)({ attempt }, inspectOpt)].join(' '));
         const started = Date.now();
-        const { statusCode } = await got(url, {
-            responseType: 'json',
-            timeout: timeoutSec * 1000,
-            retry: 0,
-            followRedirect: false,
-            throwHttpErrors: false,
-        }).catch((err) => {
-            console.log(err.message);
-            return {
-                statusCode: 0,
-            };
+        const { err, fetchResponse } = await fetcher.rawFetch(url, {
+            mode: 'json',
+            timeoutSeconds: timeoutSec,
+            retry: {
+                count: 0,
+            },
+            followRedirects: false,
         });
+        if (err) {
+            console.log(err);
+        }
+        const statusCode = fetchResponse?.status || 0;
         if (statusCode === 200) {
             countHealthy++;
             countUnhealthy = 0;

package/dist/server/serverStatusMiddleware.js

@@ -5,7 +5,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const deployInfo_util_1 = require("./deployInfo.util");
 const { versions } = process;
-const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV } = process.env;
+const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV, NODE_OPTIONS } = process.env;
 function serverStatusMiddleware(projectDir, extra) {
     return async (req, res) => {
         res.json(getServerStatusData(projectDir, extra));
@@ -17,7 +17,7 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
     const t = (0, js_lib_1.localTime)(ts);
     const deployBuildTime = t.toPretty();
     const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_');
-    return (0, js_lib_1._filterFalsyValues)({
+    return (0, js_lib_1._filterNullishValues)({
         started: getStartedStr(),
         deployBuildTime,
         APP_ENV,
@@ -30,6 +30,8 @@ function getServerStatusData(projectDir = process.cwd(), extra) {
         cpuAvg: nodejs_lib_1.processSharedUtil.cpuAvg(),
         // resourceUsage: process.resourceUsage?.(),
         versions,
+        NODE_OPTIONS,
+        fetch: typeof globalThis.fetch === 'function',
         ...extra,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.10.2",
+  "version": "4.12.0",
   "scripts": {
     "prepare": "husky install && patch-package",
     "serve": "APP_ENV=dev nodemon",

package/src/deploy/deployHealthCheck.ts

@@ -1,6 +1,5 @@
 import { inspect, InspectOptions } from 'node:util'
-import { pDelay, _filterFalsyValues, _ms, _since } from '@naturalcycles/js-lib'
-import { getGot } from '@naturalcycles/nodejs-lib'
+import { pDelay, _filterFalsyValues, _ms, _since, getFetcher } from '@naturalcycles/js-lib'
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/dist/colors'
 import { execCommand } from '@naturalcycles/nodejs-lib/dist/exec'
 import { coloredHttpCode } from '../server/request.log.util'
@@ -95,7 +94,7 @@ export async function deployHealthCheck(
   let failed = false
   let currentInterval = intervalSec * 1000
 
-  const got = getGot()
+  const fetcher = getFetcher()
 
   while (!done) {
     // eslint-disable-next-line no-await-in-loop
@@ -127,20 +126,21 @@ export async function deployHealthCheck(
 
     const started = Date.now()
 
-    const { statusCode } = await got(url, {
-      responseType: 'json',
-      timeout: timeoutSec * 1000,
-      retry: 0, // no retries allowed
-      followRedirect: false,
-      throwHttpErrors: false,
-    }).catch((err: Error) => {
-      console.log(err.message)
-
-      return {
-        statusCode: 0,
-      }
+    const { err, fetchResponse } = await fetcher.rawFetch(url, {
+      mode: 'json',
+      timeoutSeconds: timeoutSec,
+      retry: {
+        count: 0,
+      },
+      followRedirects: false,
     })
 
+    if (err) {
+      console.log(err)
+    }
+
+    const statusCode = fetchResponse?.status || 0
+
     if (statusCode === 200) {
       countHealthy++
       countUnhealthy = 0

package/src/server/serverStatusMiddleware.ts

@@ -1,10 +1,10 @@
-import { _filterFalsyValues, localTime } from '@naturalcycles/js-lib'
+import { _filterNullishValues, localTime } from '@naturalcycles/js-lib'
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib'
 import { getDeployInfo } from './deployInfo.util'
 import { BackendRequestHandler } from './server.model'
 
 const { versions } = process
-const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV } = process.env
+const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, APP_ENV, NODE_OPTIONS } = process.env
 
 export function serverStatusMiddleware(projectDir?: string, extra?: any): BackendRequestHandler {
   return async (req, res) => {
@@ -21,7 +21,7 @@ export function getServerStatusData(
   const deployBuildTime = t.toPretty()
   const buildInfo = [t.toStringCompact(), gitBranch, gitRev].filter(Boolean).join('_')
 
-  return _filterFalsyValues({
+  return _filterNullishValues({
     started: getStartedStr(),
     deployBuildTime,
     APP_ENV,
@@ -34,6 +34,8 @@ export function getServerStatusData(
     cpuAvg: processSharedUtil.cpuAvg(),
     // resourceUsage: process.resourceUsage?.(),
     versions,
+    NODE_OPTIONS,
+    fetch: typeof globalThis.fetch === 'function',
     ...extra,
   })
 }