@naturalcycles/backend-lib 4.20.2 → 4.21.1

package/dist/admin/base.admin.service.js

@@ -186,7 +186,7 @@ class BaseAdminService {
             res
                 .cookie(this.cfg.adminTokenKey, token, {
                 maxAge,
-                sameSite: 'lax',
+                sameSite: 'lax', // can be: none, lax, strict
                 // comment these 2 lines to debug on localhost
                 httpOnly: true,
                 secure: true,

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/deploy/deployPrepare.js

@@ -30,7 +30,7 @@ const DEFAULT_FILES = [
     // '!dist/**/*.test.*',
     // '!dist/**/*.mock.*',
     '!dist/**/*.script.*',
-    'src',
+    'src', // For Sentry
     '!src/test',
     '!src/**/*.test.*',
     '!src/**/*.mock.*',
@@ -38,15 +38,15 @@ const DEFAULT_FILES = [
     '!**/__snapshots__',
     '!**/__exclude',
     'static',
-    'secret/**/*.enc',
+    'secret/**/*.enc', // encrypted secrets
     'package.json',
     'yarn.lock',
     '.yarnrc',
-    'tsconfig.json',
+    'tsconfig.json', // for path-mapping to work!
     'tsconfig.dist.json',
     '.gcloudignore',
     'app.yaml',
-    'patches',
+    'patches', // to allow patch-package
     'resources',
 ];
 const defaultFilesDir = `${paths_cnst_1.srcDir}/deploy/files-default`;

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

@@ -35,7 +35,7 @@ class SentrySharedService {
             console.log('SentryService init...');
         }
         sentry.init({
-            maxValueLength: 2000,
+            maxValueLength: 2000, // default is 250 characters
             ...this.sentryServiceCfg,
         });
         return sentry;
@@ -113,8 +113,8 @@ class SentrySharedService {
      */
     getCommonLogger() {
         return {
-            log: () => { },
-            warn: () => { },
+            log: () => { }, // noop
+            warn: () => { }, // noop
             error: (...args) => {
                 const message = args.map(arg => (0, nodejs_lib_1._inspect)(arg, INSPECT_OPT)).join(' ');
                 this.sentry().addBreadcrumb({

package/dist/testing/express.test.service.js

@@ -31,8 +31,8 @@ class ExpressTestService {
             retry: { count: 0 },
             logRequest: true,
             logResponse: true,
-            logWithBaseUrl: false,
-            fetchFn: nativeFetchFn,
+            logWithBaseUrl: false, // for stable error snapshots
+            fetchFn: nativeFetchFn, // this is to make it NOT mockable
             ...opt,
         }).onAfterResponse(async () => {
             // This "empty" hook exists to act like `await pDelay`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/backend-lib",
-  "version": "4.20.2",
+  "version": "4.21.1",
   "scripts": {
     "prepare": "husky install",
     "serve": "APP_ENV=dev nodemon",
@@ -29,7 +29,7 @@
     "ejs": "^3.0.1",
     "express": "^4.16.4",
     "express-promise-router": "^4.0.0",
-    "firebase-admin": "^11.0.0",
+    "firebase-admin": "^12.0.0",
     "helmet": "^7.0.0",
     "js-yaml": "^4.0.0",
     "on-finished": "^2.3.0",

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'),
     },
   )