@entity-access/server-pages 1.1.567 → 1.1.569

package/src/ServerPages.ts

@@ -26,6 +26,7 @@ import { Http2SecureServer, Http2ServerRequest, Http2ServerResponse } from "node
 import { Socket } from "node:net";
 import { IncomingMessage, ServerResponse } from "node:http";
 import sleep from "./sleep.js";
+import ServerLogger from "./core/ServerLogger.js";
 
 export const wsData = Symbol("wsData");
 
@@ -47,6 +48,7 @@ const sensitiveRoutes = (name: string) => name;
 export default class ServerPages {
 
     serverID: any;
+    logger: ServerLogger;
 
 
     public static create(globalServiceProvider: ServiceProvider = new ServiceProvider()) {
@@ -195,7 +197,7 @@ export default class ServerPages {
                     });
 
                     httpServer.on("clientError", (err, socket: Socket) => {
-                        console.error(err);
+                        this.reportError({ error: err });
                         // if (err.code === "ERR_HTTP_REQUEST_TIMEOUT") {
                         //     try {
                         //         if (!socket.destroyed) {
@@ -219,11 +221,14 @@ export default class ServerPages {
                     throw new Error(`Unknown protocol ${protocol}`);
             }
 
-            httpServer.on("error", console.error);
-            httpServer.on("sessionError" ,console.error);
-
-            // http1Server?.on("error", console.error);
-            // http1Server?.on("sessionError" ,console.error);
+            httpServer.on("error", (error: any) => this.reportError({
+                url: "error",
+                error
+            }));
+            httpServer.on("sessionError" ,(error: any) => this.reportError({
+                url: "error",
+                error
+            }));
 
             await new Promise<void>((resolve, reject) => {
 
@@ -273,9 +278,11 @@ export default class ServerPages {
                 }
             }
 
+            this.logger = ServiceProvider.resolve(this, ServerLogger);
+
             return httpServer;
         } catch (error) {
-            console.error(error);
+            this.reportError(error);
         }
         return null;
     }
@@ -337,7 +344,7 @@ export default class ServerPages {
             //     ":status": 200
             // });
         } catch (error) {
-            console.error(error);
+            this.reportError(error);
         }
     }
 
@@ -375,7 +382,7 @@ export default class ServerPages {
         let sent = false;
         const user = scope.resolve(SessionUser);
         user.resp = resp;
-        user.ipAddress = req.remoteIPAddress;
+        const ip = user.ipAddress = req.remoteIPAddress;
 
         const authService = scope.resolve(AuthorizationService);
 
@@ -384,6 +391,9 @@ export default class ServerPages {
 
         const hostName = req.hostName;
 
+        const userAgent = req.headers["user-agent"];
+
+
 
         try {
 
@@ -423,31 +433,30 @@ export default class ServerPages {
                 // we will not log this error
                 return;
             }
-            if (this.serverID) {
-                console.error(`Failed: ${this.serverID}:  ${req.URL}`);
-            } else {
-                console.error(`Failed: ${req.URL}`);
-            }
             if (!sent) {
                 try {
 
                     if (acceptJson || error.errorModel) {
 
-                        await Content.nativeJson({
+                        const jsonError = await Content.nativeJson({
                             details: error.stack ?? error,
                             ... error.errorModel ?? {},
                             message: error.message ?? error,
-                        }, { status: error.errorModel?.status ?? 500}).send(resp, user);
-
+                        }, { status: error.errorModel?.status ?? 500});
+                        jsonError.suppressLog = true;
+                        await jsonError.send(resp, user);
+                    this.reportError({ url, error, info: error.errorModel, userAgent, ip });
                         return;
                     }
 
                     const content = Content.html(`<!DOCTYPE html>\n<html><body><pre>Server Error for ${req.url}\r\n${error?.stack ?? error}</pre></body></html>`,
                         { status: 500});
+                    content.suppressLog = true;
                     await content.send(resp, user);
+                    this.reportError({ url, error, userAgent, ip });
                 } catch (e1) {
                     e1 = e1.stack ?? e1.toString();
-                    console.error(e1);
+                    this.reportError({ url, error: e1, userAgent, ip });
                     try {
                         await resp.sendReader(500, {}, Readable.from([ e1]), true);
                     } catch {
@@ -456,9 +465,14 @@ export default class ServerPages {
                 }
                 return;
             }
-            console.error(error.stack ?? error.toString());
+            this.reportError({ url, error, userAgent, ip });
         }
 
     }
 
+    reportError({ url = void 0, error = void 0, info = void 0, userAgent = void 0, ip = void 0}) {
+
+        this.logger.reportError({ url, serverID: this.serverID, error, info, userAgent, ip });
+    }
+
 }

package/src/core/FileLock.ts

@@ -4,6 +4,7 @@ import { existsSync, mkdirSync, openSync, constants, writeSync, closeSync, unlin
 import { createHash, randomUUID } from "node:crypto";
 import * as os from "node:os";
 import sleep from "../sleep.js";
+import ServerLogger from "./ServerLogger.js";
 
 const tmpdir = process.env.SOCIAL_MAIL_TMP_PATH || os.tmpdir();
 
@@ -86,7 +87,7 @@ class LockFile implements Disposable {
             unlinkSync(this.lockFile);
         } catch (error) {
             // ignore error...
-            console.error(error);
+            ServerLogger.reportError({ error });
         }
     }
 

package/src/core/Http2IPCProxyReceiver.ts

@@ -3,6 +3,7 @@ import { createServer, Socket, Server as SocketServer } from "net";
 import { remoteAddressSymbol } from "./remoteAddressSymbol.js";
 import { Readable } from "stream";
 import EventEmitterPromise from "./EventEmitterPromise.js";
+import ServerLogger from "./ServerLogger.js";
 
 const endSocket = (s: Socket) => {
     try {
@@ -52,7 +53,7 @@ export default class Http2IPCProxyReceiver {
             socket.setKeepAlive(false);
 
             socket.on("error", (error) => {
-                console.error(error);
+                ServerLogger.error(error);
                 endSocket(socket);
             });
 

package/src/core/HttpIPCProxyReceiver.ts

@@ -4,6 +4,7 @@ import { createServer, Socket, Server as SocketServer } from "net";
 import { remoteAddressSymbol } from "./remoteAddressSymbol.js";
 import { Readable, Stream } from "stream";
 import EventEmitterPromise from "./EventEmitterPromise.js";
+import ServerLogger from "./ServerLogger.js";
 
 const endSocket = (s: Socket) => {
     try {
@@ -68,7 +69,7 @@ export default class HttpIPCProxyReceiver {
         try {
 
             socket.on("error", (error) => {
-                console.error(error);
+                ServerLogger.error(error);
                 endSocket(socket);
             });
 
@@ -102,7 +103,7 @@ export default class HttpIPCProxyReceiver {
         private forward1: http.Server
     ) {
         this.server = createServer({ keepAlive: true, keepAliveInitialDelay: 5000, noDelay: true }, this.onConnection);
-        this.server.on("error", console.error);
+        this.server.on("error", ServerLogger.error);
     }
 
     listen(port, listener?: any) {

package/src/core/ServerLogger.ts

@@ -0,0 +1,28 @@
+import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+
+@RegisterSingleton
+export default class ServerLogger {
+
+    static error = (error) => ServerLogger.reportError({ error });
+
+    static reportError({ url = void 0, serverID = void 0, error = void 0, info = void 0}) {
+        const { instance } = ServerLogger;
+        if (instance) {
+            return instance.reportError({ url, serverID, error, info });
+        }
+        const cause = error.cause?.stack ?? error.cause?.toString();
+        console.error(JSON.stringify({ url, serverID, error, cause, info }));
+    }
+
+    private static instance: ServerLogger;
+
+    constructor() {
+        ServerLogger.instance = this;
+    }
+
+    reportError({ url, serverID = void 0, error = void 0, info = void 0, userAgent = void 0, ip = void 0}) {
+        const cause = error.cause?.stack ?? error.cause?.toString();
+        console.error(JSON.stringify({ url, serverID, error: error.stack ?? error.toString(), cause, info }));
+    }
+
+}

package/src/core/TimeoutTracker.ts

@@ -1,3 +1,5 @@
+import ServerLogger from "./ServerLogger.js";
+
 export default class TimeoutTracker implements Disposable {
 
     static create(fx: () => any) {
@@ -11,7 +13,7 @@ export default class TimeoutTracker implements Disposable {
             this.timer = void 0;
             const p = tracker();
             if (p?.catch) {
-                p.catch(console.error);
+                p.catch(ServerLogger.error);
             }
         }, time);
     }

package/src/core/Wrapped.ts

@@ -10,6 +10,7 @@ import { CacheProperty } from "./CacheProperty.js";
 import Compression from "./Compression.js";
 import { remoteAddressSymbol } from "./remoteAddressSymbol.js";
 import { pipeline } from "stream/promises";
+import ServerLogger from "./ServerLogger.js";
 
 
 type UnwrappedRequest = IncomingMessage | Http2ServerRequest;
@@ -387,7 +388,7 @@ const extendResponse = (A: (new() => ServerResponse) | (new () => Http2ServerRes
                     await lf.writeTo(this, start, end);
                     return;
                 } catch (error) {
-                    console.error(error);
+                    ServerLogger.reportError({ error });
                     if (sent) {
                         return;
                     }

package/src/decorators/Prepare.ts

@@ -7,6 +7,7 @@ import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import { SessionUser } from "../core/SessionUser.js";
 import Content, { StatusResult } from "../Content.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
+import ServerLogger from "../core/ServerLogger.js";
 
 export const prepareSymbol = Symbol("Parse");
 
@@ -150,7 +151,7 @@ const parseForm = (page?): any => {
                 }
             });
             const tasks = [];
-            bb.on("error", console.error);
+            bb.on("error", ServerLogger.error);
             await new Promise((resolve, reject) => {
 
                 bb.on("field", (name, value) => {
@@ -166,7 +167,7 @@ const parseForm = (page?): any => {
                     file.on("limit", () => lastError = new EntityAccessError(`File size exceeded`));
                     tasks.push(tf.writeAll(file).then(() => {
                         result.files.push(tf);
-                    }, console.error));
+                    }, ServerLogger.error));
                 });
                 bb.on("filesLimit", () => lastError = new EntityAccessError(`File size exceeded`) );
                 bb.on("error", reject);
@@ -186,7 +187,7 @@ const parseForm = (page?): any => {
                 tempFolder[Symbol.dispose]();
             } catch (error) {
                 // delete folder
-                console.error(error);
+                ServerLogger.error(error);
             }
 
             return Content.text(lastError.stack ?? lastError, { status: 500, contentType: "text/plain"})

package/src/services/AuthorizationService.ts

@@ -5,6 +5,7 @@ import type { IAuthorizationCookie } from "./IAuthorizationCookie.js";
 import type { SerializeOptions } from "cookie";
 import KeyProvider, { IAuthKey } from "./KeyProvider.js";
 import { createCipheriv, createDecipheriv, privateDecrypt, publicEncrypt } from "node:crypto";
+import ServerLogger from "../core/ServerLogger.js";
 
 const secure = (process.env["SOCIAL_MAIL_AUTH_COOKIE_SECURE"] ?? "true") === "true";
 
@@ -27,7 +28,7 @@ export default class AuthorizationService {
         try {
             await this.loadUserSessionFromCookie(cookie, user);
         } catch (error) {
-            console.error(error);
+            ServerLogger.error(error);
             (user as any).isAuthorized = false;
         }
     }

package/src/socket/SocketNamespace.ts

@@ -2,6 +2,7 @@
 import { ServiceProvider, injectServiceKeysSymbol } from "@entity-access/entity-access/dist/di/di.js";
 import { Namespace, Socket } from "socket.io";
 import { IClassOf } from "@entity-access/entity-access/dist/decorators/IClassOf.js";
+import ServerLogger from "../core/ServerLogger.js";
 
 
 export function Receive(target, key) {
@@ -23,11 +24,11 @@ export function Send(target: SocketNamespace, key) {
         try {
             const socketRoom = this.server.to(room);
             if (!socketRoom) {
-                console.error(`No room for ${room}`);
+                ServerLogger.error(`No room for ${room}`);
             }
             return socketRoom.emit(key, ... args);
         } catch (error) {
-            console.error(error);
+            ServerLogger.error(error);
         }
     };
     return {

package/src/socket/SocketService.ts

@@ -7,6 +7,7 @@ import SocketNamespace, { SocketNamespaceClient } from "./SocketNamespace.js";
 import { camelToChain } from "../core/camelToChain.js";
 import AuthorizationService from "../services/AuthorizationService.js";
 import { SessionUser } from "../core/SessionUser.js";
+import ServerLogger from "../core/ServerLogger.js";
 
 export default abstract class SocketService {
 
@@ -85,7 +86,7 @@ export default abstract class SocketService {
                     }
                     await c[methodName](... args);
                 } catch (error) {
-                    console.error(error);
+                    ServerLogger.error(error);
                 } finally {
                     scope.dispose();
                 }

package/src/ssl/AcmeCertificateService.ts

@@ -8,6 +8,7 @@ import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/
 import ChallengeStore from "./AcmeChallengeStore.js";
 import CertificateStore from "./CertificateStore.js";
 import { FileLock } from "../core/FileLock.js";
+import ServerLogger from "../core/ServerLogger.js";
 
 export interface IAcmeOptions {
     sslMode?: string,
@@ -116,8 +117,7 @@ export default class AcmeCertificateService {
 
             return { cert, key };
         } catch (error) {
-            console.log(logs.join("\n"));
-            console.error(error);
+            ServerLogger.reportError({ error, info: logs.join("\n") });
             throw error;
         }
     }

package/src/ssl/ChallengeServer.ts

@@ -1,6 +1,7 @@
 import * as http from "node:http";
 import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import AcmeChallengeStore from "./AcmeChallengeStore.js";
+import ServerLogger from "../core/ServerLogger.js";
 
 @RegisterSingleton
 export default class ChallengeServer {
@@ -24,7 +25,7 @@ export default class ChallengeServer {
                 await new Promise<void>((resolve) => res.end(resolve));
                 
             } catch (error) {
-                console.error(error);
+                ServerLogger.error(error);
             }
         });
 

package/src/ssl/SecureContextService.ts

@@ -1,6 +1,7 @@
 import Inject, { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import { createSecureContext, SecureContext } from "tls";
 import AcmeCertificateService, { IAcmeOptions } from "./AcmeCertificateService.js";
+import ServerLogger from "../core/ServerLogger.js";
 
 @RegisterSingleton
 export default class SecureContextService {
@@ -18,7 +19,7 @@ export default class SecureContextService {
         this.getSecureContext(servername)
             .then((c) => cb(null, c))
             .catch((error) => {
-                console.error(error);
+                ServerLogger.error(error);
                 cb(error);
             });