@naturalcycles/backend-lib 4.19.2 → 4.20.1

package/dist/deploy/deployGae.js

@@ -22,16 +22,22 @@ async function deployGae(opt = {}) {
         gaeService,
         gaeVersion,
     });
-    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) {
-            logs(gaeProject, gaeService, gaeVersion);
+    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 });
         }
-        throw err;
-    }
+        catch (err) {
+            if (logOnFailure) {
+                logs(gaeProject, gaeService, gaeVersion);
+            }
+            throw err;
+        }
+    }, {
+        name: 'deploy',
+        maxAttempts: 2,
+        delay: 30000,
+        predicate: err => (0, js_lib_1._anyToError)(err).message.includes('operation is already in progress'),
+    });
     // Health check (versionUrl)
     // yarn deploy-health-check --url $deployInfo_versionUrl --repeat 3 --timeoutSec 180 --intervalSec 2
     await (0, deployHealthCheck_1.deployHealthCheck)(versionUrl, opt);

package/dist/server/serverStatsMiddleware.js

@@ -52,7 +52,7 @@ const serverStatsHTMLHandler = (req, res) => {
         `<td align="right"><pre>${all5xx}</pre></td>`,
         ...percentiles.map(pc => `<td align="right"><pre>${Math.round((0, js_lib_1._percentile)(allLatencies, pc))}</pre></td>`),
         `</tr>`,
-        ...(0, js_lib_1._sortBy)((0, js_lib_1._stringMapEntries)(serverStatsMap), ([_, stat]) => (0, js_lib_1._get)(stat, sortBy), false, !asc).map(([endpoint, stat]) => {
+        ...(0, js_lib_1._sortBy)((0, js_lib_1._stringMapEntries)(serverStatsMap), ([_, stat]) => (0, js_lib_1._get)(stat, sortBy), false, asc ? 'asc' : 'desc').map(([endpoint, stat]) => {
             return [
                 '<tr>',
                 `<td><pre>${endpoint}</pre></td>`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.19.2",
+  "version": "4.20.1",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",

package/src/deploy/deployGae.ts

@@ -1,5 +1,5 @@
 import { buildProdCommand } from '@naturalcycles/dev-lib'
-import { _objectAssign } from '@naturalcycles/js-lib'
+import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
 import { execVoidCommandSync } from '@naturalcycles/nodejs-lib'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
 import { deployPrepare, DeployPrepareOptions } from './deployPrepare'
@@ -29,20 +29,28 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
     gaeVersion,
   })
 
-  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) {
-      logs(gaeProject, gaeService, gaeVersion)
-    }
-
-    throw err
-  }
+  await pRetry(
+    async () => {
+      try {
+        execVoidCommandSync(
+          `gcloud app deploy ${appYamlPath} --project ${gaeProject} --version ${gaeVersion} --quiet --no-promote`,
+          [],
+          { shell: true },
+        )
+      } catch (err) {
+        if (logOnFailure) {
+          logs(gaeProject, gaeService, gaeVersion)
+        }
+        throw err
+      }
+    },
+    {
+      name: 'deploy',
+      maxAttempts: 2,
+      delay: 30_000,
+      predicate: err => _anyToError(err).message.includes('operation is already in progress'),
+    },
+  )
 
   // Health check (versionUrl)
   // yarn deploy-health-check --url $deployInfo_versionUrl --repeat 3 --timeoutSec 180 --intervalSec 2

package/src/server/serverStatsMiddleware.ts

@@ -88,7 +88,7 @@ export const serverStatsHTMLHandler: BackendRequestHandler = (req, res) => {
       _stringMapEntries(serverStatsMap),
       ([_, stat]) => _get(stat, sortBy),
       false,
-      !asc,
+      asc ? 'asc' : 'desc',
     ).map(([endpoint, stat]) => {
       return [
         '<tr>',