fix: update Logger implementation

.gitlab-ci.yml

@@ -39,9 +39,9 @@ test:
     paths:
       - reports/aas-portal.xml
       - reports/aas-server.xml
-      - reports/common.xml
+      - reports/aas-core.xml
     reports:
-      junit: [reports/aas-portal.xml, reports/aas-server.xml, reports/common.xml]
+      junit: [reports/aas-portal.xml, reports/aas-server.xml, reports/aas-core.xml]
       coverage_report:
         coverage_format: cobertura
         path: reports/**/cobertura-coverage.xml

.vscode/launch.json

@@ -30,8 +30,9 @@
                 "WEB_ROOT": "projects/aas-portal/dist",
                 "ASSETS": "projects/aas-server/src/assets",
                 // "USER_STORAGE": "mongodb://localhost:27017/aasportal-users",
+                "USER_STORAGE": "mongodb://172.16.160.178:27017/aasportal-users",
                 // "TEMPLATE_STORAGE": "http://localhost:8080/templates",
-                // "AAS_INDEX": "mysql://localhost:3306",
+                // "AAS_INDEX": "mysql://172.16.160.171:3306",
                 "ENDPOINTS": "[\"file:///endpoints/samples?name=Samples\"]",
             }
         },

Dockerfile

@@ -14,8 +14,8 @@ COPY package.json package.json
 COPY projects/aas-server/package.json projects/aas-server/package.json
 COPY --from=build /usr/src/app/projects/aas-server/dist/ /usr/src/app/
 COPY --from=build /usr/src/app/projects/aas-server/app-info.json /usr/src/app/app-info.json
-COPY --from=build /usr/src/app/projects/aas-core/dist/ /usr/src/app/node_modules/common/dist/
-COPY --from=build /usr/src/app/projects/aas-core/package.json /usr/src/app/node_modules/common/package.json
+COPY --from=build /usr/src/app/projects/aas-core/dist/ /usr/src/app/node_modules/aas-core/dist/
+COPY --from=build /usr/src/app/projects/aas-core/package.json /usr/src/app/node_modules/aas-core/package.json
 COPY --from=build /usr/src/app/projects/aas-portal/dist/browser/ /usr/src/app/wwwroot/
 RUN npm install -w=aas-server --omit=dev
 COPY projects/aas-server/src/assets assets/

Dockerfile.aas-server

@@ -21,6 +21,7 @@ COPY projects/aas-server/src/assets assets/
 ENV NODE_LOG=./log/debug.log
 ENV NODE_SERVER_PORT=1337
 ENV USER_STORAGE=mongodb://172.16.160.178:27017/aasportal-users
+ENV AAS_INDEX=mysql://172.16.160.171:3306
 ENV ENDPOINTS=["\"file:///endpoints/samples?name=Samples\""]
 ENV NODE_ENV=production
 

projects/aas-server/src/app/auth/user-storage.ts

@@ -39,30 +39,35 @@ export abstract class UserStorage {
     public abstract deleteAsync(userId: string): Promise<boolean>;
 
     /**
+     * Determines whether a cookie with the specified name exists.
      * @param userId The user identification.
      * @param name The cookie name.
      */
     public abstract checkCookieAsync(userId: string, name: string): Promise<boolean>;
 
     /**
+     * Gets the value of a cookie.
      * @param userId The user identification.
      * @param name The cookie name.
      */
     public abstract getCookieAsync(userId: string, name: string): Promise<Cookie | undefined>;
 
     /**
+     * Gets all cookies for the user with the specified ID.
      * @param userId The user identification.
      */
     public abstract getCookiesAsync(userId: string): Promise<Cookie[]>;
 
     /**
+     * Sets a new cookie value.
      * @param userId The user identification.
      * @param name The cookie name.
      * @param data
      */
     public abstract setCookieAsync(userId: string, name: string, data: string): Promise<void>;
 
     /**
+     * Deletes a cookie.
      * @param userId The user identification.
      * @param name The cookie name.
      */

projects/aas-server/src/app/logging/console-transport.ts

@@ -0,0 +1,27 @@
+/******************************************************************************
+ *
+ * Copyright (c) 2019-2024 Fraunhofer IOSB-INA Lemgo,
+ * eine rechtlich nicht selbstaendige Einrichtung der Fraunhofer-Gesellschaft
+ * zur Foerderung der angewandten Forschung e.V.
+ *
+ *****************************************************************************/
+
+import Transport from 'winston-transport';
+
+export class ConsoleTransport extends Transport {
+    public override log = (info: { level: string; message: string }, callback: () => void) => {
+        setImmediate(() => this.emit('logged', info));
+
+        if (info.level === 'error') {
+            console.error(info.message);
+        } else if (info.level === 'warn') {
+            console.warn(info.message);
+        } else {
+            console.info(info.message);
+        }
+
+        if (callback) {
+            callback();
+        }
+    };
+}

projects/aas-server/src/app/logging/file-logger.ts

@@ -50,7 +50,7 @@ export class FileLogger extends Logger {
 
             if (text) {
                 if (!this.record.errors.has(text)) {
-                    this.logger.error(text);
+                    this.logger.log('error', text);
                 }
 
                 this.record.errors.set(text, Date.now());
@@ -67,7 +67,7 @@ export class FileLogger extends Logger {
 
             if (text) {
                 if (!this.record.warnings.has(text)) {
-                    this.logger.warn(text);
+                    this.logger.log('warn', text);
                 }
 
                 this.record.warnings.set(text, Date.now());
@@ -84,7 +84,7 @@ export class FileLogger extends Logger {
 
             if (text) {
                 if (!this.record.messages.has(text)) {
-                    this.logger.info(text);
+                    this.logger.log('info', text);
                 }
 
                 this.record.messages.set(text, Date.now());
@@ -104,7 +104,7 @@ export class FileLogger extends Logger {
             }
 
             if (text) {
-                this.logger.debug(text);
+                this.logger.log('debug', text);
             }
         }
     }

projects/aas-server/src/app/logging/logger-factory.ts

@@ -12,6 +12,7 @@ import winston from 'winston';
 import DailyRotateFile from 'winston-daily-rotate-file';
 import { isMainThread } from 'worker_threads';
 import { noop } from 'aas-core';
+import { ConsoleTransport } from './console-transport.js';
 
 /* istanbul ignore next */
 export class LoggerFactory {
@@ -24,6 +25,7 @@ export class LoggerFactory {
         return winston.createLogger({
             level: process.env.NODE_ENV === 'production' ? 'info' : 'debug',
             transports: [
+                new ConsoleTransport(),
                 new DailyRotateFile({
                     filename: filename,
                     datePattern: 'YYYY-MM-DD',
@@ -32,9 +34,6 @@ export class LoggerFactory {
                     maxFiles: '2d',
                     format: winston.format.combine(winston.format.timestamp(), winston.format.json()),
                 }),
-                new winston.transports.Console({
-                    format: winston.format.simple(),
-                }),
             ],
         });
     }