@naturalcycles/backend-lib 9.19.0 → 9.21.0

package/dist/server/serverStatusMiddleware.js

@@ -3,7 +3,7 @@ import { _filterNullishValues } from '@naturalcycles/js-lib/object/object.util.j
 import { memoryUsageFull, processSharedUtil } from '@naturalcycles/nodejs-lib';
 import { getDeployInfo } from '../deploy/deployInfo.util.js';
 const { versions, arch, platform } = process;
-const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, GOOGLE_CLOUD_PROJECT, K_SERVICE, K_REVISION, APP_ENV, NODE_OPTIONS, DEPLOY_BUILD_TIME, } = process.env;
+const { GAE_APPLICATION, GAE_SERVICE, GAE_VERSION, GOOGLE_CLOUD_PROJECT, K_SERVICE, K_REVISION, APP_ENV, NODE_OPTIONS, DEPLOY_BUILD_TIME, BUILD_VERSION, } = process.env;
 export function serverStatusMiddleware(projectDir, extra) {
     return async (_req, res) => {
         res.json(getServerStatusData(projectDir, extra));
@@ -16,6 +16,7 @@ export function getServerStatusData(projectDir = process.cwd(), extra) {
     return _filterNullishValues({
         nodeProcessStarted: getStartedStr(),
         deployBuildTime,
+        BUILD_VERSION,
         APP_ENV,
         GOOGLE_CLOUD_PROJECT,
         GAE_APPLICATION,

package/dist/validation/ajv/ajvValidateRequest.js

@@ -26,13 +26,13 @@ class AjvValidateRequest {
         const originalProperty = req[reqProperty] || {};
         const item = mutate ? originalProperty : { ...originalProperty };
         // Ajv mutates the input
-        const error = schema.getValidationError(item, {
+        const [error, output] = schema.getValidationResult(item, {
             objectName: `request ${reqProperty}`,
         });
         if (error) {
             handleValidationError(error, originalProperty, opt);
         }
-        return item;
+        return output;
     }
 }
 export const ajvValidateRequest = new AjvValidateRequest();

package/dist/validation/joi/joiValidateRequest.js

@@ -26,7 +26,7 @@ class ValidateRequest {
         const { mutate } = opt;
         const originalProperty = req[reqProperty] || {};
         // Joi does not mutate the input
-        const { error, value } = getValidationResult(originalProperty, schema, `request ${reqProperty}`);
+        const [error, value] = getValidationResult(originalProperty, schema, `request ${reqProperty}`);
         if (error) {
             if (opt.redactPaths) {
                 error.data.joiValidationErrorItems.length = 0; // clears the array

package/dist/validation/zod/zodValidateRequest.js

@@ -26,7 +26,7 @@ class ZodValidateRequest {
         const { mutate } = opt;
         const originalProperty = req[reqProperty] || {};
         // Zod does not mutate the input
-        const { error, data } = zSafeValidate(originalProperty, schema);
+        const [error, data] = zSafeValidate(originalProperty, schema);
         if (error) {
             handleValidationError(error, originalProperty, opt);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.19.0",
+  "version": "9.21.0",
   "peerDependencies": {
     "@sentry/node": "^9"
   },
@@ -29,7 +29,7 @@
     "@sentry/node": "^9",
     "@types/ejs": "^3",
     "fastify": "^5",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "19.14.0"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/server/serverStatusMiddleware.ts

@@ -15,6 +15,7 @@ const {
   APP_ENV,
   NODE_OPTIONS,
   DEPLOY_BUILD_TIME,
+  BUILD_VERSION,
 } = process.env
 
 export function serverStatusMiddleware(projectDir?: string, extra?: any): BackendRequestHandler {
@@ -34,6 +35,7 @@ export function getServerStatusData(
   return _filterNullishValues({
     nodeProcessStarted: getStartedStr(),
     deployBuildTime,
+    BUILD_VERSION,
     APP_ENV,
     GOOGLE_CLOUD_PROJECT,
     GAE_APPLICATION,

package/src/validation/ajv/ajvValidateRequest.ts

@@ -55,7 +55,7 @@ class AjvValidateRequest {
     const item: T = mutate ? originalProperty : { ...originalProperty }
 
     // Ajv mutates the input
-    const error = schema.getValidationError(item, {
+    const [error, output] = schema.getValidationResult(item, {
       objectName: `request ${reqProperty}`,
     })
 
@@ -63,7 +63,7 @@ class AjvValidateRequest {
       handleValidationError(error, originalProperty, opt)
     }
 
-    return item
+    return output
   }
 }
 

package/src/validation/joi/joiValidateRequest.ts

@@ -55,7 +55,7 @@ class ValidateRequest {
     const originalProperty = req[reqProperty] || {}
 
     // Joi does not mutate the input
-    const { error, value } = getValidationResult(originalProperty, schema, `request ${reqProperty}`)
+    const [error, value] = getValidationResult(originalProperty, schema, `request ${reqProperty}`)
 
     if (error) {
       if (opt.redactPaths) {

package/src/validation/zod/zodValidateRequest.ts

@@ -54,7 +54,7 @@ class ZodValidateRequest {
     const originalProperty = req[reqProperty] || {}
 
     // Zod does not mutate the input
-    const { error, data } = zSafeValidate(
+    const [error, data] = zSafeValidate(
       originalProperty,
       schema,
       // opt2?.itemName,

package/dist/admin/login.html

@@ -1,150 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Login</title>
-
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-
-    <!-- CSS only -->
-    <link
-      href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.2/dist/css/bootstrap.min.css"
-      rel="stylesheet"
-      crossorigin="anonymous"
-    />
-  </head>
-  <body>
-    <div id="app" style="padding: 40px 50px">
-      <pre v-if="loading">Checking login...</pre>
-      <div v-else>
-        <div v-if="user">
-          <p>Logged in as:</p>
-          <pre><mark>{{ user.email }}</mark></pre>
-          <pre><mark>{{ user.token }}</mark></pre>
-          <button class="btn btn-primary btn-lg" @click="logout">Logout</button>
-        </div>
-        <div v-else>
-          <button class="btn btn-primary btn-lg" @click="login" id="loginBtn">Login</button>
-        </div>
-      </div>
-    </div>
-
-    <script type="module">
-      import { createApp } from 'https://cdn.jsdelivr.net/npm/vue@3.2.20/dist/vue.esm-browser.prod.js'
-      import { initializeApp } from 'https://www.gstatic.com/firebasejs/9.1.2/firebase-app.js'
-      import {
-        getAuth,
-        GoogleAuthProvider,
-        onAuthStateChanged,
-        signInWithRedirect,
-      } from 'https://www.gstatic.com/firebasejs/9.1.2/firebase-auth.js'
-
-      const apiKey = '<%= firebaseApiKey %>'
-      const authDomain = '<%= firebaseAuthDomain %>'
-      // const authProvider = '<%= firebaseAuthProvider %>'
-
-      if (!apiKey || !authDomain) {
-        alert(`Error: 'apiKey' or 'authDomain' is missing!`)
-      }
-
-      // Initialize Firebase
-      initializeApp({
-        apiKey,
-        authDomain,
-      })
-
-      const auth = getAuth()
-      const provider = new GoogleAuthProvider()
-
-      onAuthStateChanged(auth, user => {
-        // console.log('onAuthStateChanged, user: ', JSON.stringify(user, null, 2))
-        // console.log('onAuthStateChanged, user: ', user)
-        onUser(user)
-      })
-
-      const qs = Object.fromEntries(new URLSearchParams(location.search))
-      const { autoLogin, logout, returnUrl, adminTokenKey = 'admin_token' } = qs
-      // console.log(qs)
-
-      const app = createApp({
-        data() {
-          return {
-            loading: 'Loading...',
-            user: undefined,
-          }
-        },
-        methods: {
-          login: async function () {
-            try {
-              await signInWithRedirect(auth, provider)
-            } catch (err) {
-              logError(err)
-            }
-          },
-
-          logout: async function () {
-            try {
-              await auth.signOut()
-
-              await postToken('logout') // magic string
-
-              if (logout && returnUrl) {
-                alert('Logged out, redurecting back...')
-                location.href = returnUrl
-              }
-            } catch (err) {
-              logError(err)
-            }
-          },
-        },
-      }).mount('#app')
-
-      if (logout) app.logout()
-
-      ////
-
-      async function onUser(user) {
-        try {
-          // alert('onUser')
-          app.user = user
-          app.loading = false
-          if (!user) {
-            if (autoLogin) app.login()
-          } else {
-            const token = await auth.currentUser.getIdToken()
-
-            // alert('idToken')
-            // console.log(idToken)
-            app.user = Object.assign({}, app.user, {
-              token,
-            })
-
-            await postToken(token)
-
-            // Redirect if needed
-            if (returnUrl) {
-              // alert(`Logged in as ${app.user.email}, redirecting back...`)
-              location.href = returnUrl
-            }
-          }
-        } catch (err) {
-          logError(err)
-        }
-      }
-
-      function logError(err) {
-        console.error(err)
-        alert('Error\n ' + JSON.stringify(err, null, 2))
-      }
-
-      async function postToken(token) {
-        await fetch(`/admin/login`, {
-          method: 'post',
-          headers: {
-            Authentication: token,
-          },
-        })
-      }
-    </script>
-  </body>
-</html>

package/dist/deploy/files-default/.gcloudignore

@@ -1,7 +0,0 @@
-#
-# .gcloudignore
-#
-.gcloudignore
-.git
-.gitignore
-node_modules/