@naturalcycles/backend-lib 4.20.1 → 4.21.0

package/dist/deploy/deploy.util.js

@@ -7,7 +7,7 @@ const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const APP_YAML_DEFAULT = () => ({
-    runtime: 'nodejs18',
+    runtime: 'nodejs20',
     service: 'default',
     inbound_services: ['warmup'],
     instance_class: 'F1',

package/dist/deploy/deployGae.js

@@ -9,10 +9,8 @@ const deployPrepare_1 = require("./deployPrepare");
 async function deployGae(opt = {}) {
     const { logOnFailure, logOnSuccess } = opt;
     // 1. build-prod
-    // await execCommand(`yarn`, [`build-prod`])
     (0, dev_lib_1.buildProdCommand)();
     // 2. deploy-prepare
-    // await execCommand(`yarn`, ['deploy-prepare'])
     const deployInfo = await (0, deployPrepare_1.deployPrepare)();
     const targetDir = './tmp/deploy';
     const appYamlPath = `${targetDir}/app.yaml`;
@@ -22,6 +20,7 @@ async function deployGae(opt = {}) {
         gaeService,
         gaeVersion,
     });
+    (0, nodejs_lib_1.appendToGithubSummary)(`[versionUrl](${versionUrl})`);
     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 });
@@ -36,6 +35,8 @@ async function deployGae(opt = {}) {
         name: 'deploy',
         maxAttempts: 2,
         delay: 30000,
+        // todo: this doesn't work, as the error is different from what is logged.
+        // We shoud somehow capture the logged text
         predicate: err => (0, js_lib_1._anyToError)(err).message.includes('operation is already in progress'),
     });
     // Health check (versionUrl)

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

@@ -90,7 +90,7 @@ class SentrySharedService {
         // It will log additional "breadcrumb object" before the error
         // It's a Breadcrumb, not a console.log, because console.log are NOT automatically attached as Breadcrumbs in cron-job environments (outside of Express)
         this.sentry().addBreadcrumb({
-            message: (0, nodejs_lib_1.inspectAny)(err, INSPECT_OPT),
+            message: (0, nodejs_lib_1._inspect)(err, INSPECT_OPT),
         });
         return this.sentry().captureException(err);
     }
@@ -116,7 +116,7 @@ class SentrySharedService {
             log: () => { },
             warn: () => { },
             error: (...args) => {
-                const message = args.map(arg => (0, nodejs_lib_1.inspectAny)(arg, INSPECT_OPT)).join(' ');
+                const message = args.map(arg => (0, nodejs_lib_1._inspect)(arg, INSPECT_OPT)).join(' ');
                 this.sentry().addBreadcrumb({
                     message,
                 });

package/dist/server/appEngineLogMiddleware.js

@@ -44,7 +44,7 @@ function logToDev(requestId, args) {
     // Run on local machine
     console.log([
         requestId ? [(0, nodejs_lib_1.dimGrey)(`[${requestId}]`)] : [],
-        ...args.map(a => (0, nodejs_lib_1.inspectAny)(a, { includeErrorStack: true, colors: true })),
+        ...args.map(a => (0, nodejs_lib_1._inspect)(a, { includeErrorStack: true, colors: true })),
     ].join(' '));
 }
 /**
@@ -52,7 +52,7 @@ function logToDev(requestId, args) {
  * This is to not confuse e.g Sentry when it picks up messages with colors
  */
 function logToCI(args) {
-    console.log(args.map(a => (0, nodejs_lib_1.inspectAny)(a, { includeErrorStack: true, colors: false })).join(' '));
+    console.log(args.map(a => (0, nodejs_lib_1._inspect)(a, { includeErrorStack: true, colors: false })).join(' '));
 }
 function appEngineLogMiddleware() {
     if (!isGAE || !GOOGLE_CLOUD_PROJECT) {

package/dist/server/simpleRequestLoggerMiddleware.js

@@ -27,7 +27,7 @@ function simpleRequestLoggerMiddleware(_cfg = {}) {
                 (0, request_log_util_1.logRequest)(req, res.statusCode, (0, nodejs_lib_1.dimGrey)((0, js_lib_1._since)(started)));
                 // Avoid logging twice. It was previously logged by genericErrorHandler
                 // if (res.__err) {
-                //   logRequest(req, res.statusCode, dimGrey(_since(started)), inspectAny(res.__err))
+                //   logRequest(req, res.statusCode, dimGrey(_since(started)), _inspect(res.__err))
                 // } else {
                 //   logRequest(req, res.statusCode, dimGrey(_since(started)))
                 // }

package/package.json

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

package/src/deploy/deploy.util.ts

@@ -6,7 +6,7 @@ import { BackendCfg } from './backend.cfg.util'
 import { AppYaml, DeployInfo } from './deploy.model'
 
 const APP_YAML_DEFAULT = (): AppYaml => ({
-  runtime: 'nodejs18',
+  runtime: 'nodejs20',
   service: 'default',
   inbound_services: ['warmup'],
   instance_class: 'F1',

package/src/deploy/deployGae.ts

@@ -1,6 +1,6 @@
 import { buildProdCommand } from '@naturalcycles/dev-lib'
 import { _anyToError, _objectAssign, pRetry } from '@naturalcycles/js-lib'
-import { execVoidCommandSync } from '@naturalcycles/nodejs-lib'
+import { appendToGithubSummary, execVoidCommandSync } from '@naturalcycles/nodejs-lib'
 import { deployHealthCheck, DeployHealthCheckOptions } from './deployHealthCheck'
 import { deployPrepare, DeployPrepareOptions } from './deployPrepare'
 
@@ -11,12 +11,10 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
 
   // 1. build-prod
 
-  // await execCommand(`yarn`, [`build-prod`])
   buildProdCommand()
 
   // 2. deploy-prepare
 
-  // await execCommand(`yarn`, ['deploy-prepare'])
   const deployInfo = await deployPrepare()
 
   const targetDir = './tmp/deploy'
@@ -29,6 +27,8 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
     gaeVersion,
   })
 
+  appendToGithubSummary(`[versionUrl](${versionUrl})`)
+
   await pRetry(
     async () => {
       try {
@@ -48,6 +48,8 @@ export async function deployGae(opt: DeployGaeOptions = {}): Promise<void> {
       name: 'deploy',
       maxAttempts: 2,
       delay: 30_000,
+      // todo: this doesn't work, as the error is different from what is logged.
+      // We shoud somehow capture the logged text
       predicate: err => _anyToError(err).message.includes('operation is already in progress'),
     },
   )

package/src/sentry/sentry.shared.service.ts

@@ -5,7 +5,7 @@ import {
   CommonLogger,
   CommonLogLevel,
 } from '@naturalcycles/js-lib'
-import { inspectAny, InspectAnyOptions } from '@naturalcycles/nodejs-lib'
+import { _inspect, InspectAnyOptions } from '@naturalcycles/nodejs-lib'
 // eslint-disable-next-line import/no-duplicates
 import type { Breadcrumb, NodeOptions, SeverityLevel } from '@sentry/node'
 // eslint-disable-next-line import/no-duplicates
@@ -115,7 +115,7 @@ export class SentrySharedService {
     // It will log additional "breadcrumb object" before the error
     // It's a Breadcrumb, not a console.log, because console.log are NOT automatically attached as Breadcrumbs in cron-job environments (outside of Express)
     this.sentry().addBreadcrumb({
-      message: inspectAny(err, INSPECT_OPT),
+      message: _inspect(err, INSPECT_OPT),
     })
 
     return this.sentry().captureException(err)
@@ -145,7 +145,7 @@ export class SentrySharedService {
       log: () => {}, // noop
       warn: () => {}, // noop
       error: (...args) => {
-        const message = args.map(arg => inspectAny(arg, INSPECT_OPT)).join(' ')
+        const message = args.map(arg => _inspect(arg, INSPECT_OPT)).join(' ')
 
         this.sentry().addBreadcrumb({
           message,

package/src/server/appEngineLogMiddleware.ts

@@ -1,6 +1,6 @@
 import { inspect } from 'node:util'
 import { AnyObject, CommonLogger } from '@naturalcycles/js-lib'
-import { dimGrey, inspectAny } from '@naturalcycles/nodejs-lib'
+import { dimGrey, _inspect } from '@naturalcycles/nodejs-lib'
 import { BackendRequestHandler } from './server.model'
 
 const { GOOGLE_CLOUD_PROJECT, GAE_INSTANCE } = process.env
@@ -53,7 +53,7 @@ function logToDev(requestId: string | null, args: any[]): void {
   console.log(
     [
       requestId ? [dimGrey(`[${requestId}]`)] : [],
-      ...args.map(a => inspectAny(a, { includeErrorStack: true, colors: true })),
+      ...args.map(a => _inspect(a, { includeErrorStack: true, colors: true })),
     ].join(' '),
   )
 }
@@ -63,7 +63,7 @@ function logToDev(requestId: string | null, args: any[]): void {
  * This is to not confuse e.g Sentry when it picks up messages with colors
  */
 function logToCI(args: any[]): void {
-  console.log(args.map(a => inspectAny(a, { includeErrorStack: true, colors: false })).join(' '))
+  console.log(args.map(a => _inspect(a, { includeErrorStack: true, colors: false })).join(' '))
 }
 
 export function appEngineLogMiddleware(): BackendRequestHandler {

package/src/server/simpleRequestLoggerMiddleware.ts

@@ -44,7 +44,7 @@ export function simpleRequestLoggerMiddleware(
 
         // Avoid logging twice. It was previously logged by genericErrorHandler
         // if (res.__err) {
-        //   logRequest(req, res.statusCode, dimGrey(_since(started)), inspectAny(res.__err))
+        //   logRequest(req, res.statusCode, dimGrey(_since(started)), _inspect(res.__err))
         // } else {
         //   logRequest(req, res.statusCode, dimGrey(_since(started)))
         // }