@naturalcycles/backend-lib 4.17.11 → 4.18.0

package/cfg/tsconfig.json

@@ -10,6 +10,7 @@
     "lib": ["esnext"], // add "dom" if needed
     "module": "commonjs",
     "moduleResolution": "node",
+    "moduleDetection": "force",
 
     // Emit
     "sourceMap": false,

package/dist/admin/firebase.shared.service.js

@@ -26,7 +26,7 @@ class FirebaseSharedService {
         return this.admin().auth();
     }
 }
+exports.FirebaseSharedService = FirebaseSharedService;
 tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], FirebaseSharedService.prototype, "admin", null);
-exports.FirebaseSharedService = FirebaseSharedService;

package/dist/deploy/deployGae.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployGae = void 0;
 const dev_lib_1 = require("@naturalcycles/dev-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const exec_1 = require("@naturalcycles/nodejs-lib/dist/exec");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const deployHealthCheck_1 = require("./deployHealthCheck");
 const deployPrepare_1 = require("./deployPrepare");
 async function deployGae(opt = {}) {
     const { logOnFailure, logOnSuccess } = opt;
     // 1. build-prod
     // await execCommand(`yarn`, [`build-prod`])
-    await (0, dev_lib_1.buildProdCommand)();
+    (0, dev_lib_1.buildProdCommand)();
     // 2. deploy-prepare
     // await execCommand(`yarn`, ['deploy-prepare'])
     const deployInfo = await (0, deployPrepare_1.deployPrepare)();
@@ -22,13 +22,16 @@ async function deployGae(opt = {}) {
         gaeService,
         gaeVersion,
     });
-    // gcloud app deploy ./tmp/deploy/app.yaml --project $deployInfo_gaeProject --version $deployInfo_gaeVersion --quiet --no-promote
-    await (0, exec_1.execCommand)(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`).catch(async (err) => {
+    try {
+        // gcloud app deploy ./tmp/deploy/app.yaml --project $deployInfo_gaeProject --version $deployInfo_gaeVersion --quiet --no-promote
+        (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`, [], { shell: true });
+    }
+    catch (err) {
         if (logOnFailure) {
-            await logs(gaeProject, gaeService, gaeVersion);
+            logs(gaeProject, gaeService, gaeVersion);
         }
         throw err;
-    });
+    }
     // Health check (versionUrl)
     // yarn deploy-health-check --url $deployInfo_versionUrl --repeat 3 --timeoutSec 180 --intervalSec 2
     await (0, deployHealthCheck_1.deployHealthCheck)(versionUrl, opt);
@@ -36,17 +39,20 @@ async function deployGae(opt = {}) {
     if (gaeVersion !== '1') {
         // Rollout (promote versionUrl to serviceUrl)
         // gcloud app services set-traffic $deployInfo_gaeService --project $deployInfo_gaeProject --splits $deployInfo_gaeVersion=1 --quiet
-        await (0, exec_1.execCommand)(`gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`);
+        (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`, [], { shell: true });
         // Health check (serviceUrl)
         // yarn deploy-health-check --url $deployInfo_serviceUrl --repeat 3 --timeoutSec 60 --intervalSec 2
         await (0, deployHealthCheck_1.deployHealthCheck)(serviceUrl, opt);
     }
     // Logs
     if (logOnSuccess) {
-        await logs(gaeProject, gaeService, gaeVersion);
+        logs(gaeProject, gaeService, gaeVersion);
     }
 }
 exports.deployGae = deployGae;
-async function logs(gaeProject, gaeService, gaeVersion) {
-    await (0, exec_1.execCommand)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`).catch(_ignored => { });
+function logs(gaeProject, gaeService, gaeVersion) {
+    try {
+        (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
+    }
+    catch { }
 }

package/dist/deploy/deployHealthCheck.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployHealthCheck = exports.deployHealthCheckYargsOptions = void 0;
 const node_util_1 = require("node:util");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-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");
 exports.deployHealthCheckYargsOptions = {
     thresholdHealthy: {
@@ -72,12 +72,18 @@ async function deployHealthCheck(url, opt = {}) {
     if (failed) {
         console.log((0, colors_1.red)(`Health check failed!`));
         if (logOnFailure) {
-            await (0, exec_1.execCommand)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`).catch(_ignored => { });
+            try {
+                (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
+            }
+            catch { }
         }
         process.exit(1);
     }
     if (logOnSuccess) {
-        await (0, exec_1.execCommand)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`).catch(_ignored => { });
+        try {
+            (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
+        }
+        catch { }
     }
     async function makeAttempt() {
         attempt++;

package/dist/sentry/sentry.shared.service.js

@@ -128,7 +128,7 @@ class SentrySharedService {
         };
     }
 }
+exports.SentrySharedService = SentrySharedService;
 tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], SentrySharedService.prototype, "sentry", null);
-exports.SentrySharedService = SentrySharedService;

package/dist/server/startServer.js

@@ -78,10 +78,10 @@ class BackendServer {
         }
     }
 }
+exports.BackendServer = BackendServer;
 tslib_1.__decorate([
     (0, js_lib_1._Memo)()
 ], BackendServer.prototype, "stop", null);
-exports.BackendServer = BackendServer;
 /**
  * Convenience function.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.17.11",
+  "version": "4.18.0",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -46,7 +46,7 @@
     "@types/yargs": "^16.0.0",
     "fastify": "^4.0.0",
     "jest": "^29.0.1",
-    "nodemon": "^2.0.14",
+    "nodemon": "^3.0.1",
     "vue-class-component": "^7.2.6",
     "vuepress": "^1.7.1",
     "vuepress-plugin-typescript": "^0.3.1"

package/src/deploy/deployGae.ts

@@ -1,6 +1,6 @@
 import { buildProdCommand } from '@naturalcycles/dev-lib'
 import { _objectAssign } from '@naturalcycles/js-lib'
-import { execCommand } from '@naturalcycles/nodejs-lib/dist/exec'
+import { execVoidCommandSync } from '@naturalcycles/nodejs-lib'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
 import { deployPrepare, DeployPrepareOptions } from './deployPrepare'
 
@@ -12,7 +12,7 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
   // 1. build-prod
 
   // await execCommand(`yarn`, [`build-prod`])
-  await buildProdCommand()
+  buildProdCommand()
 
   // 2. deploy-prepare
 
@@ -29,16 +29,20 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
     gaeVersion,
   })
 
-  // gcloud app deploy ./tmp/deploy/app.yaml --project $deployInfo_gaeProject --version $deployInfo_gaeVersion --quiet --no-promote
-  await execCommand(
-    `gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`,
-  ).catch(async err => {
+  try {
+    // gcloud app deploy ./tmp/deploy/app.yaml --project $deployInfo_gaeProject --version $deployInfo_gaeVersion --quiet --no-promote
+    execVoidCommandSync(
+      `gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`,
+      [],
+      { shell: true },
+    )
+  } catch (err) {
     if (logOnFailure) {
-      await logs(gaeProject, gaeService, gaeVersion)
+      logs(gaeProject, gaeService, gaeVersion)
     }
 
     throw err
-  })
+  }
 
   // Health check (versionUrl)
   // yarn deploy-health-check --url $deployInfo_versionUrl --repeat 3 --timeoutSec 180 --intervalSec 2
@@ -48,8 +52,10 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
   if (gaeVersion !== '1') {
     // Rollout (promote versionUrl to serviceUrl)
     // gcloud app services set-traffic $deployInfo_gaeService --project $deployInfo_gaeProject --splits $deployInfo_gaeVersion=1 --quiet
-    await execCommand(
+    execVoidCommandSync(
       `gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`,
+      [],
+      { shell: true },
     )
 
     // Health check (serviceUrl)
@@ -59,12 +65,16 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
 
   // Logs
   if (logOnSuccess) {
-    await logs(gaeProject, gaeService, gaeVersion)
+    logs(gaeProject, gaeService, gaeVersion)
   }
 }
 
-async function logs(gaeProject: string, gaeService: string, gaeVersion: string): Promise<void> {
-  await execCommand(
-    `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
-  ).catch(_ignored => {})
+function logs(gaeProject: string, gaeService: string, gaeVersion: string): void {
+  try {
+    execVoidCommandSync(
+      `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
+      [],
+      { shell: true },
+    )
+  } catch {}
 }

package/src/deploy/deployHealthCheck.ts

@@ -1,7 +1,7 @@
 import { inspect, InspectOptions } from 'node:util'
+import { execVoidCommandSync } 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'
 
 export interface DeployHealthCheckOptions {
@@ -104,18 +104,26 @@ export async function deployHealthCheck(
     console.log(red(`Health check failed!`))
 
     if (logOnFailure) {
-      await execCommand(
-        `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
-      ).catch(_ignored => {})
+      try {
+        execVoidCommandSync(
+          `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
+          [],
+          { shell: true },
+        )
+      } catch {}
     }
 
     process.exit(1)
   }
 
   if (logOnSuccess) {
-    await execCommand(
-      `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
-    ).catch(_ignored => {})
+    try {
+      execVoidCommandSync(
+        `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
+        [],
+        { shell: true },
+      )
+    } catch {}
   }
 
   async function makeAttempt(): Promise<void> {