@naturalcycles/backend-lib 9.46.0 → 9.46.2

package/dist/admin/base.admin.service.d.ts

@@ -20,8 +20,8 @@ export interface AdminInfo {
  * Base implementation based on Firebase Auth tokens passed as 'admin_token' cookie.
  */
 export declare class BaseAdminService {
-    private firebaseAuth;
-    constructor(firebaseAuth: FirebaseAdmin.auth.Auth, cfg: AdminServiceCfg);
+    private loadFirebaseAuth;
+    constructor(loadFirebaseAuth: () => Promise<FirebaseAdmin.auth.Auth>, cfg: AdminServiceCfg);
     cfg: Required<AdminServiceCfg>;
     adminInfoDisabled(): AdminInfo;
     /**
@@ -37,6 +37,7 @@ export declare class BaseAdminService {
      */
     protected onPermissionCheck(req: BackendRequest, email: string, reqPermissions: string[], required: boolean, granted: boolean, meta?: Record<string, any>): Promise<void>;
     getEmailByToken(req: BackendRequest, adminToken?: string): Promise<string | undefined>;
+    private getFirebaseAuth;
     /**
      * Current implementation is based on req=Request (from Express).
      * Override if needed.

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

@@ -1,3 +1,5 @@
+import { __decorate } from "tslib";
+import { _Memo } from '@naturalcycles/js-lib/decorators';
 import { _assert, AppError } from '@naturalcycles/js-lib/error';
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors';
 const adminInfoDisabled = () => ({
@@ -8,9 +10,9 @@ const adminInfoDisabled = () => ({
  * Base implementation based on Firebase Auth tokens passed as 'admin_token' cookie.
  */
 export class BaseAdminService {
-    firebaseAuth;
-    constructor(firebaseAuth, cfg) {
-        this.firebaseAuth = firebaseAuth;
+    loadFirebaseAuth;
+    constructor(loadFirebaseAuth, cfg) {
+        this.loadFirebaseAuth = loadFirebaseAuth;
         this.cfg = {
             adminTokenKey: 'admin_token',
             authEnabled: true,
@@ -47,7 +49,8 @@ export class BaseAdminService {
         if (!adminToken)
             return;
         try {
-            const decodedToken = await this.firebaseAuth.verifyIdToken(adminToken);
+            const auth = await this.getFirebaseAuth();
+            const decodedToken = await auth.verifyIdToken(adminToken);
             const email = decodedToken?.email;
             req.log(`admin email: ${dimGrey(email)}`);
             return email;
@@ -63,6 +66,9 @@ export class BaseAdminService {
             req.error(`getEmailByToken error:`, err);
         }
     }
+    async getFirebaseAuth() {
+        return await this.loadFirebaseAuth();
+    }
     /**
      * Current implementation is based on req=Request (from Express).
      * Override if needed.
@@ -193,3 +199,6 @@ export class BaseAdminService {
         };
     }
 }
+__decorate([
+    _Memo()
+], BaseAdminService.prototype, "getFirebaseAuth", null);

package/dist/server/compressionMiddleware.js

@@ -157,8 +157,11 @@ export function compressionMiddleware(options) {
                 return;
             }
             // compression method
+            // Get all client-accepted encodings, then pick the first one from our preferred order
             const negotiator = new Negotiator(req);
-            let method = negotiator.encoding(SUPPORTED_ENCODING, PREFERRED_ENCODING);
+            const clientEncodings = negotiator.encodings(SUPPORTED_ENCODING);
+            // Prefer server's order, but fall back to client's first choice if no preferred match
+            let method = PREFERRED_ENCODING.find(enc => clientEncodings.includes(enc)) || clientEncodings[0];
             // if no method is found, use the default encoding
             if (!req.headers['accept-encoding'] && encodingSupported.has(enforceEncoding)) {
                 method = enforceEncoding;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.46.0",
+  "version": "9.46.2",
   "peerDependencies": {
     "@sentry/node": "^10"
   },

package/src/admin/base.admin.service.ts

@@ -1,3 +1,4 @@
+import { _Memo } from '@naturalcycles/js-lib/decorators'
 import { _assert, AppError } from '@naturalcycles/js-lib/error'
 import { dimGrey, green, red } from '@naturalcycles/nodejs-lib/colors'
 import type FirebaseAdmin from 'firebase-admin'
@@ -32,7 +33,7 @@ const adminInfoDisabled = (): AdminInfo => ({
  */
 export class BaseAdminService {
   constructor(
-    private firebaseAuth: FirebaseAdmin.auth.Auth,
+    private loadFirebaseAuth: () => Promise<FirebaseAdmin.auth.Auth>,
     cfg: AdminServiceCfg,
   ) {
     this.cfg = {
@@ -91,7 +92,8 @@ export class BaseAdminService {
     if (!adminToken) return
 
     try {
-      const decodedToken = await this.firebaseAuth.verifyIdToken(adminToken)
+      const auth = await this.getFirebaseAuth()
+      const decodedToken = await auth.verifyIdToken(adminToken)
       const email = decodedToken?.email
       req.log(`admin email: ${dimGrey(email)}`)
       return email
@@ -109,6 +111,11 @@ export class BaseAdminService {
     }
   }
 
+  @_Memo()
+  private async getFirebaseAuth(): Promise<FirebaseAdmin.auth.Auth> {
+    return await this.loadFirebaseAuth()
+  }
+
   /**
    * Current implementation is based on req=Request (from Express).
    * Override if needed.

package/src/server/compressionMiddleware.ts

@@ -239,8 +239,12 @@ export function compressionMiddleware(options?: CompressionOptions): BackendRequ
       }
 
       // compression method
+      // Get all client-accepted encodings, then pick the first one from our preferred order
       const negotiator = new Negotiator(req)
-      let method: string | undefined = negotiator.encoding(SUPPORTED_ENCODING, PREFERRED_ENCODING)
+      const clientEncodings = negotiator.encodings(SUPPORTED_ENCODING) as string[]
+      // Prefer server's order, but fall back to client's first choice if no preferred match
+      let method: string | undefined =
+        PREFERRED_ENCODING.find(enc => clientEncodings.includes(enc)) || clientEncodings[0]
 
       // if no method is found, use the default encoding
       if (!req.headers['accept-encoding'] && encodingSupported.has(enforceEncoding)) {