@naturalcycles/backend-lib 5.8.0 → 5.8.2

package/dist/deploy/deployGae.js

@@ -11,7 +11,7 @@ const deployPrepare_1 = require("./deployPrepare");
 async function deployGae(opt = {}) {
     const { logOnFailure, logOnSuccess } = opt;
     // 1. build
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn', ['build']);
+    nodejs_lib_1.exec2.spawn('yarn build');
     // 2. deploy-prepare
     const deployInfo = await (0, deployPrepare_1.deployPrepare)();
     const targetDir = './tmp/deploy';
@@ -24,7 +24,7 @@ async function deployGae(opt = {}) {
     });
     await (0, js_lib_1.pRetry)(async () => {
         try {
-            (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`, [], { shell: true });
+            nodejs_lib_1.exec2.spawn(`gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`);
         }
         catch (err) {
             if (logOnFailure) {
@@ -47,7 +47,7 @@ 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
-        (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`, [], { shell: true });
+        nodejs_lib_1.exec2.spawn(`gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`);
         // Health check (serviceUrl)
         // yarn deploy-health-check --url $deployInfo_serviceUrl --repeat 3 --timeoutSec 60 --intervalSec 2
         await (0, deployHealthCheck_1.deployHealthCheck)(serviceUrl, opt);
@@ -71,12 +71,12 @@ async function undeployGae(branch) {
     //   return
     // }
     console.log(`undeployGae (branch: ${branch}): going to remove ${gaeProject}/${gaeService}/${gaeVersion}`);
-    (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`, [], { shell: true });
+    nodejs_lib_1.exec2.spawn(`gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`);
     (0, nodejs_lib_1.appendToGithubSummary)(`removed ${gaeProject}/${gaeService}/${gaeVersion}`);
 }
 function logs(gaeProject, gaeService, gaeVersion) {
     try {
-        (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
+        nodejs_lib_1.exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
     }
     catch { }
 }

package/dist/deploy/deployHealthCheck.js

@@ -73,7 +73,7 @@ async function deployHealthCheck(url, opt = {}) {
         console.log((0, nodejs_lib_1.red)(`Health check failed!`));
         if (logOnFailure) {
             try {
-                (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
+                nodejs_lib_1.exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
             }
             catch { }
         }
@@ -81,7 +81,7 @@ async function deployHealthCheck(url, opt = {}) {
     }
     if (logOnSuccess) {
         try {
-            (0, nodejs_lib_1.execVoidCommandSync)(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`, [], { shell: true });
+            nodejs_lib_1.exec2.spawn(`gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`);
         }
         catch { }
     }

package/dist/env/env.shared.service.d.ts

@@ -3,14 +3,11 @@ export interface BaseEnv {
     name: string;
 }
 export interface EnvSharedServiceCfg<ENV> {
-    /**
-     * Dir with ${envName}.env.ts files
-     */
-    envMap: StringMap<ENV>;
+    environments: ENV[];
 }
 export declare class EnvSharedService<ENV extends BaseEnv> {
-    cfg: EnvSharedServiceCfg<ENV>;
     constructor(cfg: EnvSharedServiceCfg<ENV>);
+    envMap: StringMap<ENV>;
     private env?;
     init(): void;
     getEnv(): ENV;

package/dist/env/env.shared.service.js

@@ -5,7 +5,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 class EnvSharedService {
     constructor(cfg) {
-        this.cfg = cfg;
+        this.envMap = (0, js_lib_1._by)(cfg.environments, e => e.name);
     }
     init() {
         this.getEnv();
@@ -14,7 +14,7 @@ class EnvSharedService {
         if (!this.env) {
             const { APP_ENV } = process.env;
             (0, js_lib_1._assert)(APP_ENV, 'APP_ENV should be defined!');
-            const env = this.cfg.envMap[APP_ENV];
+            const env = this.envMap[APP_ENV];
             (0, js_lib_1._assert)(env, `Environment ${APP_ENV} is not defined`);
             this.env = env;
             console.log(`APP_ENV=${(0, nodejs_lib_1.dimGrey)(APP_ENV)} loaded`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/deploy/deployGae.ts

@@ -1,5 +1,5 @@
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
-import { appendToGithubSummary, execVoidCommandSync } from '@naturalcycles/nodejs-lib'
+import { appendToGithubSummary, exec2 } from '@naturalcycles/nodejs-lib'
 import { getBackendCfg } from './backend.cfg.util'
 import { createDeployInfo } from './deploy.util'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
@@ -12,7 +12,7 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
 
   // 1. build
 
-  execVoidCommandSync('yarn', ['build'])
+  exec2.spawn('yarn build')
 
   // 2. deploy-prepare
 
@@ -31,10 +31,8 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
   await pRetry(
     async () => {
       try {
-        execVoidCommandSync(
+        exec2.spawn(
           `gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`,
-          [],
-          { shell: true },
         )
       } catch (err) {
         if (logOnFailure) {
@@ -61,10 +59,8 @@ 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
-    execVoidCommandSync(
+    exec2.spawn(
       `gcloud app services set-traffic ${gaeService} --project ${gaeProject} --splits ${gaeVersion}=1 --quiet`,
-      [],
-      { shell: true },
     )
 
     // Health check (serviceUrl)
@@ -99,10 +95,8 @@ export async function undeployGae(branch: string): Promise<void> {
     `undeployGae (branch: ${branch}): going to remove ${gaeProject}/${gaeService}/${gaeVersion}`,
   )
 
-  execVoidCommandSync(
+  exec2.spawn(
     `gcloud app versions delete --project ${gaeProject} --service ${gaeService} ${gaeVersion} --quiet`,
-    [],
-    { shell: true },
   )
 
   appendToGithubSummary(`removed ${gaeProject}/${gaeService}/${gaeVersion}`)
@@ -110,10 +104,8 @@ export async function undeployGae(branch: string): Promise<void> {
 
 function logs(gaeProject: string, gaeService: string, gaeVersion: string): void {
   try {
-    execVoidCommandSync(
+    exec2.spawn(
       `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
-      [],
-      { shell: true },
     )
   } catch {}
 }

package/src/deploy/deployHealthCheck.ts

@@ -1,6 +1,6 @@
 import { inspect, InspectOptions } from 'node:util'
 import { _filterFalsyValues, _ms, _since, getFetcher, pDelay } from '@naturalcycles/js-lib'
-import { dimGrey, execVoidCommandSync, red } from '@naturalcycles/nodejs-lib'
+import { dimGrey, exec2, red } from '@naturalcycles/nodejs-lib'
 import { coloredHttpCode } from '../server/request.log.util'
 
 export interface DeployHealthCheckOptions {
@@ -104,10 +104,8 @@ export async function deployHealthCheck(
 
     if (logOnFailure) {
       try {
-        execVoidCommandSync(
+        exec2.spawn(
           `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
-          [],
-          { shell: true },
         )
       } catch {}
     }
@@ -117,10 +115,8 @@ export async function deployHealthCheck(
 
   if (logOnSuccess) {
     try {
-      execVoidCommandSync(
+      exec2.spawn(
         `gcloud app logs read --project ${gaeProject} --service ${gaeService} --version ${gaeVersion}`,
-        [],
-        { shell: true },
       )
     } catch {}
   }

package/src/env/env.shared.service.ts

@@ -1,4 +1,4 @@
-import { _assert, StringMap } from '@naturalcycles/js-lib'
+import { _assert, _by, StringMap } from '@naturalcycles/js-lib'
 import { dimGrey } from '@naturalcycles/nodejs-lib'
 
 export interface BaseEnv {
@@ -6,14 +6,15 @@ export interface BaseEnv {
 }
 
 export interface EnvSharedServiceCfg<ENV> {
-  /**
-   * Dir with ${envName}.env.ts files
-   */
-  envMap: StringMap<ENV>
+  environments: ENV[]
 }
 
 export class EnvSharedService<ENV extends BaseEnv> {
-  constructor(public cfg: EnvSharedServiceCfg<ENV>) {}
+  constructor(cfg: EnvSharedServiceCfg<ENV>) {
+    this.envMap = _by(cfg.environments, e => e.name)
+  }
+
+  envMap: StringMap<ENV>
 
   private env?: ENV
 
@@ -26,7 +27,7 @@ export class EnvSharedService<ENV extends BaseEnv> {
       const { APP_ENV } = process.env
       _assert(APP_ENV, 'APP_ENV should be defined!')
 
-      const env = this.cfg.envMap[APP_ENV]
+      const env = this.envMap[APP_ENV]
       _assert(env, `Environment ${APP_ENV} is not defined`)
 
       this.env = env