badmfck-api-server 5.0.9 → 5.0.11

package/dist/apiServer/APIService.d.ts

@@ -58,6 +58,7 @@ export interface APIServiceOptions<TInterceptor = unknown> {
     metricsDir?: string;
     blueGreenWatchMs?: number;
     logFiles?: ILogFilesOptions;
+    monitorAuthDir?: string;
     monitorAuthFile?: string;
 }
 type InferInterceptor<T> = T extends IInterceptor<infer U> ? U : unknown;

package/dist/apiServer/monitor/Monitor.js

@@ -40,7 +40,7 @@ class Monitor extends BaseEndpoint_1.BaseEndpoint {
     constructor(options) {
         super("sm");
         this.apiServiceOptions = options;
-        MonitorAuth_1.MonitorAuth.configure(options.monitorAuthFile, options.projectName);
+        MonitorAuth_1.MonitorAuth.configure({ authFile: options.monitorAuthFile, authDir: options.monitorAuthDir, projectName: options.projectName });
         this.registerEndpoints([
             { ignoreInterceptor: true, endpoint: "html", handler: this.html },
             { ignoreInterceptor: true, endpoint: "log", handler: this.logs },

package/dist/apiServer/monitor/MonitorAuth.d.ts

@@ -18,7 +18,12 @@ export declare class MonitorAuth {
     private static projectKey;
     private static enrolled;
     private static storeLoaded;
-    static configure(authFile?: string | null, projectName?: string): void;
+    private static fileSafe;
+    static configure(opts?: {
+        authFile?: string | null;
+        authDir?: string | null;
+        projectName?: string;
+    }): void;
     private static loadStore;
     private static saveStore;
     static secretFor(user: IMonitorUser): string | null;
@@ -37,6 +42,7 @@ export declare class MonitorAuth {
     private static base32Decode;
     private static hotp;
     static verifyTotp(login: string, secretBase32: string, code: string): string | null;
+    private static base32Encode;
     static generateTotpSecret(login: string, issuer?: string): {
         secret: string;
         uri: string;

package/dist/apiServer/monitor/MonitorAuth.js

@@ -27,14 +27,26 @@ class MonitorAuth {
     static projectKey = "default";
     static enrolled = new Map();
     static storeLoaded = false;
-    static configure(authFile, projectName) {
-        MonitorAuth.authFile = authFile && authFile.length > 0 ? authFile : null;
-        MonitorAuth.projectKey = (projectName && projectName.length > 0 ? projectName : "default");
+    static fileSafe(name) {
+        const safe = String(name || "").replace(/[^A-Za-z0-9._-]+/g, "_").replace(/^_+|_+$/g, "");
+        return safe.length > 0 ? safe.slice(0, 64) : "default";
+    }
+    static configure(opts) {
+        const authFile = opts?.authFile;
+        const authDir = opts?.authDir;
+        const project = opts?.projectName;
+        if (authFile && authFile.length > 0)
+            MonitorAuth.authFile = authFile;
+        else if (authDir && authDir.length > 0)
+            MonitorAuth.authFile = path_1.default.join(authDir, `monitor-2fa.${MonitorAuth.fileSafe(project ?? "")}.json`);
+        else
+            MonitorAuth.authFile = null;
+        MonitorAuth.projectKey = (project && project.length > 0 ? project : "default");
         MonitorAuth.enrolled.clear();
         MonitorAuth.storeLoaded = false;
         MonitorAuth.loadStore();
         if (!MonitorAuth.authFile)
-            (0, LogService_1.logWarn)("Monitor 2FA: no monitorAuthFile configured — enrollments live in memory only and are LOST on restart");
+            (0, LogService_1.logWarn)("Monitor 2FA: neither monitorAuthFile nor monitorAuthDir is set — enrollments live in memory only and are LOST on restart");
     }
     static loadStore() {
         if (MonitorAuth.storeLoaded)
@@ -56,7 +68,7 @@ class MonitorAuth {
                         lastCounter: Number(r.lastCounter) || 0,
                     });
             }
-            (0, LogService_1.logInfo)(`Monitor 2FA: loaded ${MonitorAuth.enrolled.size} enrollment(s) for project "${MonitorAuth.projectKey}"`, "MonitorAuth");
+            (0, LogService_1.logInfo)(`Monitor 2FA: loaded ${MonitorAuth.enrolled.size} enrollment(s) for project "${MonitorAuth.projectKey}" from ${MonitorAuth.authFile}`, "MonitorAuth");
         }
         catch (e) {
             (0, LogService_1.logWarn)("Monitor 2FA: cannot read store, treating as empty: " + (e?.message ?? e));
@@ -179,12 +191,23 @@ class MonitorAuth {
         }
         return "TOTP code is invalid";
     }
-    static generateTotpSecret(login, issuer = "Monitor") {
+    static base32Encode(buf) {
         const A = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-        const raw = crypto_1.default.randomBytes(20);
-        let secret = "";
-        for (let i = 0; i < raw.length; i++)
-            secret += A[raw[i] % 32];
+        let bits = 0, value = 0, out = "";
+        for (const b of buf) {
+            value = (value << 8) | b;
+            bits += 8;
+            while (bits >= 5) {
+                out += A[(value >>> (bits - 5)) & 31];
+                bits -= 5;
+            }
+        }
+        if (bits > 0)
+            out += A[(value << (5 - bits)) & 31];
+        return out;
+    }
+    static generateTotpSecret(login, issuer = "Monitor") {
+        const secret = MonitorAuth.base32Encode(crypto_1.default.randomBytes(20));
         const safeIssuer = String(issuer || "").replace(/[:\u0000-\u001f]/g, " ").trim() || "Monitor";
         const label = encodeURIComponent(`${safeIssuer}:${login}`);
         const uri = `otpauth://totp/${label}?secret=${secret}&issuer=${encodeURIComponent(safeIssuer)}&algorithm=SHA1&digits=6&period=30`;

package/dist/apiServer/monitor/index.html

@@ -1,8 +1,8 @@
 <!doctype html>
 <html lang="en">
 	<head>
-	<!-- Build: 2026-10-14T12:52:03.029Z | Version: 1.0.18 -->
-	<script>var __ver = "1.0.18";</script>
+	<!-- Build: 2026-10-14T13:16:34.697Z | Version: 1.0.20 -->
+	<script>var __ver = "1.0.20";</script>
 		<meta charset="UTF-8" />
 		<link rel="icon" type="image/svg+xml" href="/vite.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -469,10 +469,10 @@ const h2={background:"#a7a7a7",backgroundSelected:"#66bb6a",toggle:"#FFFFFF"},m2
 	::-webkit-scrollbar-thumb:hover {
 		background-color:rgba(0,0,0,1);
 	}
-`,y2=e=>{for(let t in e){const n=e[t];e[n]&&(e[t]=e[n])}},px=(e,t)=>{for(let n in e)if(n!=="colors"){if(typeof e[n]=="object"){e[n]=px(e[n],t);continue}if(typeof e[n]=="string"){const r=e[n];if(t[r])e[n]=t[r];else for(let o in t)r.indexOf(o)>-1&&(e[n]=r.replace(o,t[o]))}}return e},w2=e=>(y2(e.colors),px(e,e.colors),e),S2=({theme:e,children:t})=>i.jsxs(Bw,{theme:w2(e??Op()),children:[i.jsx(v2,{theme:e??Op()}),t]}),j2=x2();function k2(){const e=Ki.use([]);let t;switch(e){case"authorized":t=i.jsx(r2,{});break;case"unauthorized":case"checking":t=i.jsx(u2,{});break;default:t=i.jsxs(O,{sx:{padding:"20px"},children:["Unknown state: ",e]})}return i.jsx(S2,{theme:j2,children:t})}In.setupReact(st.useState,st.useEffect);new Uy;La.createRoot(document.getElementById("root")).render(i.jsx(st.StrictMode,{children:i.jsx(k2,{})}));</script>
+`,y2=e=>{for(let t in e){const n=e[t];e[n]&&(e[t]=e[n])}},px=(e,t)=>{for(let n in e)if(n!=="colors"){if(typeof e[n]=="object"){e[n]=px(e[n],t);continue}if(typeof e[n]=="string"){const r=e[n];if(t[r])e[n]=t[r];else for(let o in t)r.indexOf(o)>-1&&(e[n]=r.replace(o,t[o]))}}return e},w2=e=>(y2(e.colors),px(e,e.colors),e),S2=({theme:e,children:t})=>i.jsxs(Bw,{theme:w2(e??Op()),children:[i.jsx(v2,{theme:e??Op()}),t]}),j2=x2();function k2(){const e=Ki.use([]);let t;switch(e){case"authorized":t=i.jsx(r2,{});break;case"unauthorized":case"checking":case"enroll":t=i.jsx(u2,{});break;default:t=i.jsxs(O,{sx:{padding:"20px"},children:["Unknown state: ",e]})}return i.jsx(S2,{theme:j2,children:t})}In.setupReact(st.useState,st.useEffect);new Uy;La.createRoot(document.getElementById("root")).render(i.jsx(st.StrictMode,{children:i.jsx(k2,{})}));</script>
 	</head>
 
 	<body>
 		<div id="root"></div>
 	</body>
-</html>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "5.0.9",
+  "version": "5.0.11",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",