@naturalcycles/backend-lib 9.62.0 → 9.63.1

package/dist/bin/deploy-gae.js

@@ -1,12 +1,12 @@
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args';
 import { runScript } from '@naturalcycles/nodejs-lib/runScript';
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
 import { deployGae } from '../deploy/deployGae.js';
-import { deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck.js';
-import { deployPrepareYargsOptions } from '../deploy/deployPrepare.js';
+import { deployHealthCheckCliOptions } from '../deploy/deployHealthCheck.js';
+import { deployPrepareCliOptions } from '../deploy/deployPrepare.js';
 runScript(async () => {
-    const opt = _yargs().options({
-        ...deployPrepareYargsOptions,
-        ...deployHealthCheckYargsOptions,
-    }).argv;
+    const opt = _parseArgs({
+        ...deployPrepareCliOptions,
+        ...deployHealthCheckCliOptions,
+    });
     await deployGae(opt);
 });

package/dist/bin/deploy-health-check.js

@@ -6,16 +6,16 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
 --intervalSec 2
 
  */
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args';
 import { runScript } from '@naturalcycles/nodejs-lib/runScript';
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
-import { deployHealthCheck, deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck.js';
+import { deployHealthCheck, deployHealthCheckCliOptions } from '../deploy/deployHealthCheck.js';
 runScript(async () => {
-    const { url, ...opt } = _yargs().options({
-        ...deployHealthCheckYargsOptions,
+    const { url, ...opt } = _parseArgs({
+        ...deployHealthCheckCliOptions,
         url: {
             type: 'string',
             demandOption: true,
         },
-    }).argv;
+    });
     await deployHealthCheck(url, opt);
 });

package/dist/bin/deploy-prepare.js

@@ -3,11 +3,11 @@
 yarn deploy-prepare
 
  */
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args';
 import { runScript } from '@naturalcycles/nodejs-lib/runScript';
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
-import { deployPrepare, deployPrepareYargsOptions } from '../deploy/deployPrepare.js';
+import { deployPrepare, deployPrepareCliOptions } from '../deploy/deployPrepare.js';
 runScript(async () => {
-    const opt = _yargs().options(deployPrepareYargsOptions).argv;
+    const opt = _parseArgs(deployPrepareCliOptions);
     await deployPrepare(opt);
 });
 // deploy strategy

package/dist/bin/undeploy-gae.js

@@ -1,13 +1,13 @@
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args';
 import { runScript } from '@naturalcycles/nodejs-lib/runScript';
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
 import { undeployGae } from '../deploy/deployGae.js';
 runScript(async () => {
-    const { branch } = _yargs().options({
+    const { branch } = _parseArgs({
         branch: {
             type: 'string',
             demandOption: true,
             desc: `Because Github Actions delete event happens after the branch is already deleted - you need to pass it manually`,
         },
-    }).argv;
+    });
     await undeployGae(branch);
 });

package/dist/deploy/deployHealthCheck.d.ts

@@ -11,50 +11,7 @@ export interface DeployHealthCheckOptions {
     gaeVersion?: string;
     authHeader?: string;
 }
-export declare const deployHealthCheckYargsOptions: {
-    readonly thresholdHealthy: {
-        readonly type: 'number';
-        readonly default: 5;
-    };
-    readonly thresholdUnhealthy: {
-        readonly type: 'number';
-        readonly default: 8;
-    };
-    readonly maxTries: {
-        readonly type: 'number';
-        readonly default: 30;
-    };
-    readonly timeoutSec: {
-        readonly type: 'number';
-        readonly default: 180;
-    };
-    readonly intervalSec: {
-        readonly type: 'number';
-        readonly default: 1;
-    };
-    readonly logOnFailure: {
-        readonly type: 'boolean';
-        readonly default: true;
-        readonly desc: 'Show server logs on health check failure (requires gaeProject, gaeService, gaeVersion)';
-    };
-    readonly logOnSuccess: {
-        readonly type: 'boolean';
-        readonly default: false;
-        readonly desc: 'Show server logs on health check success (requires gaeProject, gaeService, gaeVersion)';
-    };
-    readonly gaeProject: {
-        readonly type: 'string';
-    };
-    readonly gaeService: {
-        readonly type: 'string';
-    };
-    readonly gaeVersion: {
-        readonly type: 'string';
-    };
-    readonly authHeader: {
-        readonly type: 'string';
-    };
-};
+export declare const deployHealthCheckCliOptions: CliOptions;
 /**
  * Requires up to `healthyThreshold` consecutive OK responses to succeed.
  * Fails on up to `unhealthyThreshold` consecutive FAIL responses.

package/dist/deploy/deployHealthCheck.js

@@ -6,7 +6,7 @@ import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js';
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors';
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { coloredHttpCode } from '../server/request.log.util.js';
-export const deployHealthCheckYargsOptions = {
+export const deployHealthCheckCliOptions = {
     thresholdHealthy: {
         type: 'number',
         default: 5,

package/dist/deploy/deployPrepare.d.ts

@@ -9,23 +9,5 @@ export interface DeployPrepareOptions {
      */
     appYamlPassEnv?: string;
 }
-export declare const deployPrepareYargsOptions: {
-    readonly projectDir: {
-        readonly type: 'string';
-        readonly default: '.';
-    };
-    readonly targetDir: {
-        readonly type: 'string';
-        readonly default: `./tmp/deploy`;
-    };
-    readonly createNpmrc: {
-        readonly type: 'boolean';
-        readonly desc: 'Create .npmrc in targetDir if NPM_TOKEN env var is set';
-        readonly default: true;
-    };
-    readonly appYamlPassEnv: {
-        readonly type: 'string';
-        readonly desc: 'Comma-separated list of env variables that will be passed to app.yaml from process.env';
-    };
-};
+export declare const deployPrepareCliOptions: CliOptions;
 export declare function deployPrepare(opt?: DeployPrepareOptions): Promise<DeployInfo>;

package/dist/deploy/deployPrepare.js

@@ -5,7 +5,7 @@ import { kpySync } from '@naturalcycles/nodejs-lib/kpy';
 import { srcDir } from '../paths.cnst.js';
 import { getBackendCfg } from './backend.cfg.util.js';
 import { createAndSaveAppYaml, createAndSaveDeployInfo } from './deploy.util.js';
-export const deployPrepareYargsOptions = {
+export const deployPrepareCliOptions = {
     projectDir: {
         type: 'string',
         default: '.',

package/dist/express/startServer.d.ts

@@ -32,7 +32,7 @@ export interface StartServerCfg extends DefaultAppCfg {
      */
     onShutdown?: () => Promise<void>;
     /**
-     * @default 3000
+     * @default 8_000
      */
     forceShutdownTimeout?: number;
     sentryService?: SentrySharedService;

package/dist/express/startServer.js

@@ -45,8 +45,13 @@ export class BackendServer {
                 resolve(server);
             });
         });
-        // This is to fix GCP LoadBalancer race condition
-        this.server.keepAliveTimeout = 600 * 1000; // 10 minutes
+        // This is to fix GCP LoadBalancer race condition:
+        // GCLB's backend keep-alive timeout is fixed at 600s, and the backend must use
+        // a strictly higher value, otherwise the server can close an idle connection at the
+        // same moment GCLB reuses it, resulting in intermittent 502s.
+        // https://cloud.google.com/load-balancing/docs/https#timeouts_and_retries
+        this.server.keepAliveTimeout = 620 * 1000; // slightly above GCLB's 600s
+        this.server.headersTimeout = 630 * 1000; // conventionally kept above keepAliveTimeout
         let address = `http://localhost:${port}`; // default
         const addr = this.server.address();
         if (addr) {
@@ -77,7 +82,7 @@ export class BackendServer {
         const shutdownTimeout = setTimeout(() => {
             console.log(boldGrey('Forceful shutdown after timeout'));
             process.exit(0);
-        }, this.cfg.forceShutdownTimeout ?? 10_000);
+        }, this.cfg.forceShutdownTimeout ?? 8000);
         try {
             await Promise.all([
                 this.server && new Promise(r => this.server.close(r)),

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.62.0",
+  "version": "9.63.1",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15",
     "@types/body-parser": "^1",
-    "@types/compressible": "^2",
     "@types/cookie-parser": "^1",
     "@types/cors": "^2",
     "@types/express": "^5",
+    "@types/compressible": "^2",
     "@types/on-finished": "^2",
     "@types/on-headers": "^1",
     "@types/vary": "^1",
@@ -20,8 +20,8 @@
     "express": "^5",
     "helmet": "^8",
     "negotiator": "^1",
-    "on-finished": "^2",
     "on-headers": "^1",
+    "on-finished": "^2",
     "tslib": "^2",
     "vary": "^1"
   },
@@ -43,9 +43,9 @@
   },
   "devDependencies": {
     "@sentry/node-core": "^10",
-    "@typescript/native-preview": "beta",
+    "typescript": "rc",
     "fastify": "^5",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "0.0.0"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/bin/deploy-gae.ts

@@ -1,14 +1,14 @@
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args'
 import { runScript } from '@naturalcycles/nodejs-lib/runScript'
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs'
 import { deployGae } from '../deploy/deployGae.js'
-import { deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck.js'
-import { deployPrepareYargsOptions } from '../deploy/deployPrepare.js'
+import { deployHealthCheckCliOptions } from '../deploy/deployHealthCheck.js'
+import { deployPrepareCliOptions } from '../deploy/deployPrepare.js'
 
 runScript(async () => {
-  const opt = _yargs().options({
-    ...deployPrepareYargsOptions,
-    ...deployHealthCheckYargsOptions,
-  }).argv
+  const opt = _parseArgs({
+    ...deployPrepareCliOptions,
+    ...deployHealthCheckCliOptions,
+  })
 
   await deployGae(opt)
 })

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

@@ -7,18 +7,18 @@ yarn deploy-health-check --url https://service-dot-yourproject.appspot.com
 
  */
 
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args'
 import { runScript } from '@naturalcycles/nodejs-lib/runScript'
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs'
-import { deployHealthCheck, deployHealthCheckYargsOptions } from '../deploy/deployHealthCheck.js'
+import { deployHealthCheck, deployHealthCheckCliOptions } from '../deploy/deployHealthCheck.js'
 
 runScript(async () => {
-  const { url, ...opt } = _yargs().options({
-    ...deployHealthCheckYargsOptions,
+  const { url, ...opt } = _parseArgs({
+    ...deployHealthCheckCliOptions,
     url: {
       type: 'string',
       demandOption: true,
     },
-  }).argv
+  })
 
   await deployHealthCheck(url, opt)
 })

package/src/bin/deploy-prepare.ts

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

package/src/bin/undeploy-gae.ts

@@ -1,15 +1,15 @@
+import { _parseArgs } from '@naturalcycles/nodejs-lib/args'
 import { runScript } from '@naturalcycles/nodejs-lib/runScript'
-import { _yargs } from '@naturalcycles/nodejs-lib/yargs'
 import { undeployGae } from '../deploy/deployGae.js'
 
 runScript(async () => {
-  const { branch } = _yargs().options({
+  const { branch } = _parseArgs({
     branch: {
       type: 'string',
       demandOption: true,
       desc: `Because Github Actions delete event happens after the branch is already deleted - you need to pass it manually`,
     },
-  }).argv
+  })
 
   await undeployGae(branch)
 })

package/src/deploy/deployHealthCheck.ts

@@ -8,6 +8,7 @@ import {
 } from '@naturalcycles/js-lib/object/object.util.js'
 import { pDelay } from '@naturalcycles/js-lib/promise/pDelay.js'
 import type { UnixTimestampMillis } from '@naturalcycles/js-lib/types'
+import type { CliOptions } from '@naturalcycles/nodejs-lib/args'
 import { dimGrey, red } from '@naturalcycles/nodejs-lib/colors'
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2'
 import { coloredHttpCode } from '../server/request.log.util.js'
@@ -26,7 +27,7 @@ export interface DeployHealthCheckOptions {
   authHeader?: string
 }
 
-export const deployHealthCheckYargsOptions = {
+export const deployHealthCheckCliOptions = {
   thresholdHealthy: {
     type: 'number',
     default: 5,
@@ -69,7 +70,7 @@ export const deployHealthCheckYargsOptions = {
   authHeader: {
     type: 'string',
   },
-} as const
+} as const satisfies CliOptions
 
 const inspectOpt: InspectOptions = {
   colors: true,

package/src/deploy/deployPrepare.ts

@@ -1,4 +1,5 @@
 import { loadEnvFileIfExists } from '@naturalcycles/nodejs-lib'
+import type { CliOptions } from '@naturalcycles/nodejs-lib/args'
 import { dimGrey } from '@naturalcycles/nodejs-lib/colors'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
 import { kpySync } from '@naturalcycles/nodejs-lib/kpy'
@@ -19,7 +20,7 @@ export interface DeployPrepareOptions {
   appYamlPassEnv?: string
 }
 
-export const deployPrepareYargsOptions = {
+export const deployPrepareCliOptions = {
   projectDir: {
     type: 'string',
     default: '.',
@@ -37,7 +38,7 @@ export const deployPrepareYargsOptions = {
     type: 'string',
     desc: 'Comma-separated list of env variables that will be passed to app.yaml from process.env',
   },
-} as const
+} as const satisfies CliOptions
 
 const DEFAULT_FILES = [
   'dist',

package/src/express/startServer.ts

@@ -53,8 +53,13 @@ export class BackendServer {
       })
     })
 
-    // This is to fix GCP LoadBalancer race condition
-    this.server.keepAliveTimeout = 600 * 1000 // 10 minutes
+    // This is to fix GCP LoadBalancer race condition:
+    // GCLB's backend keep-alive timeout is fixed at 600s, and the backend must use
+    // a strictly higher value, otherwise the server can close an idle connection at the
+    // same moment GCLB reuses it, resulting in intermittent 502s.
+    // https://cloud.google.com/load-balancing/docs/https#timeouts_and_retries
+    this.server.keepAliveTimeout = 620 * 1000 // slightly above GCLB's 600s
+    this.server.headersTimeout = 630 * 1000 // conventionally kept above keepAliveTimeout
 
     let address = `http://localhost:${port}` // default
 
@@ -97,7 +102,7 @@ export class BackendServer {
     const shutdownTimeout = setTimeout(() => {
       console.log(boldGrey('Forceful shutdown after timeout'))
       process.exit(0)
-    }, this.cfg.forceShutdownTimeout ?? 10_000)
+    }, this.cfg.forceShutdownTimeout ?? 8000)
 
     try {
       await Promise.all([
@@ -146,7 +151,7 @@ export interface StartServerCfg extends DefaultAppCfg {
   onShutdown?: () => Promise<void>
 
   /**
-   * @default 3000
+   * @default 8_000
    */
   forceShutdownTimeout?: number