@naturalcycles/backend-lib 9.0.0 → 9.0.2

package/dist/admin/adminMiddleware.js

@@ -1,6 +1,7 @@
 import { _memoFn, AppError } from '@naturalcycles/js-lib';
 import { fs2 } from '@naturalcycles/nodejs-lib';
 import ejs from 'ejs';
+import { srcDir } from '../paths.cnst.js';
 export function createAdminMiddleware(adminService, cfgDefaults = {}) {
     return (reqPermissions, cfg) => requireAdminPermissions(adminService, reqPermissions, {
         ...cfgDefaults,
@@ -46,7 +47,7 @@ export function loginHtml(firebaseServiceCfg) {
 }
 const getLoginHtml = _memoFn((cfg) => {
     console.log(`reading login.html`);
-    const tmpl = fs2.readText(`${__dirname}/login.html`);
+    const tmpl = fs2.readText(`${srcDir}/admin/login.html`);
     return ejs.render(tmpl, cfg);
 });
 export function getLoginHtmlRedirect(href) {

package/dist/admin/firebase.shared.service.js

@@ -11,7 +11,7 @@ export class FirebaseSharedService {
     async admin() {
         const { serviceAccount } = this.cfg;
         // lazy loading
-        const admin = await import('firebase-admin');
+        const { default: admin } = await import('firebase-admin');
         const credential = serviceAccount
             ? admin.credential.cert(serviceAccount)
             : admin.credential.applicationDefault();

package/dist/paths.cnst.js

@@ -1,5 +1,8 @@
-import path from 'node:path';
-export const projectDir = path.join(__dirname, '/..');
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+export const projectDir = join(__dirname, '/..');
 export const resourcesDir = `${projectDir}/resources`;
 export const srcDir = `${projectDir}/src`;
 export const testDir = `${srcDir}/test`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/backend-lib",
   "type": "module",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -40,7 +40,7 @@
     "simple-git": "^3"
   },
   "devDependencies": {
-    "@naturalcycles/bench-lib": "^3",
+    "@naturalcycles/bench-lib": "^4",
     "@naturalcycles/dev-lib": "^17",
     "@sentry/node": "^9",
     "@types/ejs": "^3",

package/src/admin/adminMiddleware.ts

@@ -1,6 +1,7 @@
 import { _memoFn, AppError } from '@naturalcycles/js-lib'
 import { fs2 } from '@naturalcycles/nodejs-lib'
 import ejs from 'ejs'
+import { srcDir } from '../paths.cnst.js'
 import type { BackendRequestHandler } from '../server/server.model.js'
 import type { BaseAdminService } from './base.admin.service.js'
 import type { FirebaseSharedServiceCfg } from './firebase.shared.service.js'
@@ -101,7 +102,7 @@ export function loginHtml(firebaseServiceCfg: FirebaseSharedServiceCfg): Backend
 
 const getLoginHtml = _memoFn((cfg: LoginHtmlCfg) => {
   console.log(`reading login.html`)
-  const tmpl = fs2.readText(`${__dirname}/login.html`)
+  const tmpl = fs2.readText(`${srcDir}/admin/login.html`)
   return ejs.render(tmpl, cfg)
 })
 

package/src/admin/firebase.shared.service.ts

@@ -48,7 +48,7 @@ export class FirebaseSharedService {
     const { serviceAccount } = this.cfg
 
     // lazy loading
-    const admin = await import('firebase-admin')
+    const { default: admin } = await import('firebase-admin')
 
     const credential = serviceAccount
       ? admin.credential.cert(serviceAccount)

package/src/paths.cnst.ts

@@ -1,6 +1,10 @@
-import path from 'node:path'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 
-export const projectDir = path.join(__dirname, '/..')
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+export const projectDir = join(__dirname, '/..')
 export const resourcesDir = `${projectDir}/resources`
 export const srcDir = `${projectDir}/src`
 export const testDir = `${srcDir}/test`